summaryrefslogtreecommitdiffstats
path: root/net/netfilter/nfnetlink_queue.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/nfnetlink_queue.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/nfnetlink_queue.c')
-rw-r--r--net/netfilter/nfnetlink_queue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index 808da34f94cd..7caa8b082c41 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -740,7 +740,7 @@ nfqnl_enqueue_packet(struct nf_queue_entry *entry, unsigned int queuenum)
struct net *net = entry->state.net;
struct nfnl_queue_net *q = nfnl_queue_pernet(net);
- /* rcu_read_lock()ed by nf_hook_slow() */
+ /* rcu_read_lock()ed by nf_hook_thresh */
queue = instance_lookup(q, queuenum);
if (!queue)
return -ESRCH;