mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
netfilter: Remove explicit rcu_read_lock in nf_hook_slow
All of the callers of nf_hook_slow already hold the rcu_read_lock, so this cleanup removes the recursive call. This is just a cleanup, as the locking code gracefully handles this situation. Signed-off-by: Aaron Conole <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]>
This commit is contained in:
parent
2c1e2703ff
commit
e2361cb90a
14 changed files with 19 additions and 19 deletions
|
|
@ -24,7 +24,7 @@ ebt_redirect_tg(struct sk_buff *skb, const struct xt_action_param *par)
|
|||
return EBT_DROP;
|
||||
|
||||
if (par->hooknum != NF_BR_BROUTING)
|
||||
/* rcu_read_lock()ed by nf_hook_slow */
|
||||
/* rcu_read_lock()ed by nf_hook_thresh */
|
||||
ether_addr_copy(eth_hdr(skb)->h_dest,
|
||||
br_port_get_rcu(par->in)->br->dev->dev_addr);
|
||||
else
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ ebt_basic_match(const struct ebt_entry *e, const struct sk_buff *skb,
|
|||
return 1;
|
||||
if (NF_INVF(e, EBT_IOUT, ebt_dev_check(e->out, out)))
|
||||
return 1;
|
||||
/* rcu_read_lock()ed by nf_hook_slow */
|
||||
/* rcu_read_lock()ed by nf_hook_thresh */
|
||||
if (in && (p = br_port_get_rcu(in)) != NULL &&
|
||||
NF_INVF(e, EBT_ILOGICALIN,
|
||||
ebt_dev_check(e->logical_in, p->br->dev)))
|
||||
|
|
|
|||
Loading…
Reference in a new issue