]> git.itanic.dy.fi Git - linux-stable/commitdiff
netfilter: ipset: remove rcu_read_lock_bh pair from ip_set_test
authorFlorian Westphal <fw@strlen.de>
Tue, 6 Jun 2023 11:58:27 +0000 (13:58 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 26 Jun 2023 06:05:56 +0000 (08:05 +0200)
Callers already hold rcu_read_lock.

Prior to RCU conversion this used to be a read_lock_bh(), but now the
bh-disable isn't needed anymore.

Cc: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/ipset/ip_set_core.c

index 46ebee9400dab83ef9a14a55bbfb1d2bd68005d4..a77c75f6dfb962c937c1576c9390852fcdc156ea 100644 (file)
@@ -739,9 +739,7 @@ ip_set_test(ip_set_id_t index, const struct sk_buff *skb,
            !(opt->family == set->family || set->family == NFPROTO_UNSPEC))
                return 0;
 
-       rcu_read_lock_bh();
        ret = set->variant->kadt(set, skb, par, IPSET_TEST, opt);
-       rcu_read_unlock_bh();
 
        if (ret == -EAGAIN) {
                /* Type requests element to be completed */