OSDN Git Service

netfilter: ipset: Correct rcu_dereference() call in ip_set_put_comment()
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Fri, 19 Oct 2018 17:35:19 +0000 (19:35 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Sat, 3 Nov 2018 12:27:50 +0000 (13:27 +0100)
The function is called when rcu_read_lock() is held and not
when rcu_read_lock_bh() is held.

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/linux/netfilter/ipset/ip_set_comment.h

index 8e2bab1..70877f8 100644 (file)
@@ -43,11 +43,11 @@ ip_set_init_comment(struct ip_set *set, struct ip_set_comment *comment,
        rcu_assign_pointer(comment->c, c);
 }
 
-/* Used only when dumping a set, protected by rcu_read_lock_bh() */
+/* Used only when dumping a set, protected by rcu_read_lock() */
 static inline int
 ip_set_put_comment(struct sk_buff *skb, const struct ip_set_comment *comment)
 {
-       struct ip_set_comment_rcu *c = rcu_dereference_bh(comment->c);
+       struct ip_set_comment_rcu *c = rcu_dereference(comment->c);
 
        if (!c)
                return 0;