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

Commit 49971b88 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: ipset: use nfnl_mutex_is_locked 



Check that we really hold nfnl mutex here instead of relying on correct
usage alone.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Acked-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 6b3d9330

net/netfilter/ipset/ip_set_core.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_IPSET); 


/* When the nfnl mutex is held: */

#define ip_set_dereference(p)		\

	rcu_dereference_protected(p, 1)

	rcu_dereference_protected(p, lockdep_nfnl_is_held(NFNL_SUBSYS_IPSET))

#define ip_set(inst, id)		\

	ip_set_dereference((inst)->ip_set_list)[id]