summaryrefslogtreecommitdiffstats
path: root/net/netfilter/xt_helper.c
diff options
context:
space:
mode:
authorAaron Conole2016-09-21 17:35:04 +0200
committerPablo Neira Ayuso2016-09-24 21:29:53 +0200
commite2361cb90a0327bdab34d01d1a7b9dbd67c31e60 (patch)
treed7f8b55fd607e5cb1c0018fa8f1f79d6038d17b3 /net/netfilter/xt_helper.c
parentnetfilter: call nf_hook_ingress with rcu_read_lock (diff)
downloadkernel-qcow2-linux-e2361cb90a0327bdab34d01d1a7b9dbd67c31e60.tar.gz
kernel-qcow2-linux-e2361cb90a0327bdab34d01d1a7b9dbd67c31e60.tar.xz
kernel-qcow2-linux-e2361cb90a0327bdab34d01d1a7b9dbd67c31e60.zip
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>
Diffstat (limited to 'net/netfilter/xt_helper.c')
-rw-r--r--net/netfilter/xt_helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/xt_helper.c b/net/netfilter/xt_helper.c
index 805c9f64a04c..f679dd4c272a 100644
--- a/net/netfilter/xt_helper.c
+++ b/net/netfilter/xt_helper.c
@@ -41,7 +41,7 @@ helper_mt(const struct sk_buff *skb, struct xt_action_param *par)
if (!master_help)
return ret;
- /* rcu_read_lock()ed by nf_hook_slow */
+ /* rcu_read_lock()ed by nf_hook_thresh */
helper = rcu_dereference(master_help->helper);
if (!helper)
return ret;