Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8ad1323 authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik Committed by Greg Kroah-Hartman
Browse files

netfilter: ipset: Correct rcu_dereference() call in ip_set_put_comment() 



[ Upstream commit 17b8b74c0f8dbf9b9e3301f9ca5b65dd1c079951 ]

The function is called when rcu_read_lock() is held and not
when rcu_read_lock_bh() is held.

Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2083f1d6

include/linux/netfilter/ipset/ip_set_comment.h

+2 −2
Original line number Diff line number Diff line
@@ -41,11 +41,11 @@ ip_set_init_comment(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, 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;