From: Florian Westphal Date: Thu, 30 Nov 2017 20:07:32 +0000 (+0100) Subject: netfilter: ipset: use nfnl_mutex_is_locked X-Git-Tag: v6.35~5 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d48dc4ab9013023f9d6f545fa8af10951f38917f;p=ipset 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: Florian Westphal Signed-off-by: Jozsef Kadlecsik --- diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c index d25dd46..6fbbaea 100644 --- a/kernel/net/netfilter/ipset/ip_set_core.c +++ b/kernel/net/netfilter/ipset/ip_set_core.c @@ -62,7 +62,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]