]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
netfilter: bridge: remove unneeded rcu_read_lock
authorFlorian Westphal <fw@strlen.de>
Tue, 7 Mar 2017 11:45:04 +0000 (12:45 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 8 Mar 2017 18:01:23 +0000 (19:01 +0100)
as comment says, the function is always called with rcu read lock held.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/bridge/br_netfilter_hooks.c

index 95087e6e8258366af95579bb308d1a6e18266f0e..52739e6c610e5d48d49a9113d54cfcd042bd4ab3 100644 (file)
@@ -1016,13 +1016,10 @@ int br_nf_hook_thresh(unsigned int hook, struct net *net,
        if (!elem)
                return okfn(net, sk, skb);
 
-       /* We may already have this, but read-locks nest anyway */
-       rcu_read_lock();
        nf_hook_state_init(&state, hook, NFPROTO_BRIDGE, indev, outdev,
                           sk, net, okfn);
 
        ret = nf_hook_slow(skb, &state, elem);
-       rcu_read_unlock();
        if (ret == 1)
                ret = okfn(net, sk, skb);