Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2361cb9 authored Sep 21, 2016 by Aaron Conole Committed by Pablo Neira Ayuso Sep 24, 2016

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 <aconole@bytheb.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent 2c1e2703

net/bridge/netfilter/ebt_redirect.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

net/bridge/netfilter/ebtables.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)))

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ static unsigned int ipv4_helper(void *priv,
		if (!help)
		return NF_ACCEPT;

		/* rcu_read_lock()ed by nf_hook_slow */
		/* rcu_read_lock()ed by nf_hook_thresh */
		helper = rcu_dereference(help->helper);
		if (!helper)
		return NF_ACCEPT;

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -149,7 +149,7 @@ icmp_error_message(struct net net, struct nf_conn tmpl, struct sk_buff *skb,
		return -NF_ACCEPT;
		}

		/* rcu_read_lock()ed by nf_hook_slow */
		/* rcu_read_lock()ed by nf_hook_thresh */
		innerproto = __nf_ct_l4proto_find(PF_INET, origtuple.dst.protonum);

		/* Ordinarily, we'd expect the inverted tupleproto, but it's

net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ static unsigned int ipv6_helper(void *priv,
		help = nfct_help(ct);
		if (!help)
		return NF_ACCEPT;
		/* rcu_read_lock()ed by nf_hook_slow */
		/* rcu_read_lock()ed by nf_hook_thresh */
		helper = rcu_dereference(help->helper);
		if (!helper)
		return NF_ACCEPT;