netfilter: ipset: use nfnl_mutex_is_locked
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 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 <[email protected]>
---
net/netfilter/ipset/ip_set_core.c +1 -1
@@ -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]
Signature · 1 line
2.14.3
Hi Florian,
Quoted 4 lines · Florian Westphal
Check that we really hold nfnl mutex here instead of relying on correct usage alone.
Signed-off-by Florian Westphal <[email protected]>
Yes, it's better this way :-)
Acked-by Jozsef Kadlecsik <[email protected]>
Quoted 22 lines
---
net/netfilter/ipset/ip_set_core.c +1
-1@@ -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]Signature · 6 lines
2.14.3 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
-
E-mail : [email protected], [email protected] PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
H-1525 Budapest 114, POB. 49, Hungary
Quoted 4 lines · Jozsef Kadlecsik
Hi Florian,
On Thu, 30 Nov 2017, Florian Westphal wrote:
Quoted 8 lines
Quoted 4 lines
Check that we really hold nfnl mutex here instead of relying on correct usage alone.
Signed-off-by Florian Westphal <[email protected]>Yes, it's better this way :-)
Acked-by Jozsef Kadlecsik <[email protected]>
Applied, thanks.