ipset patch for nf
Subsystems (2)
cover ipset patch for nf
Hi Pablo,
Please apply the next patch to the nf tree, which fixes a suspicious rcu_dereference_protected() call.
- The patch fixing the race between namespace cleanup and gc in ipset left out checking the pernet exit phase when calling rcu_dereference_protected(), which thus resulted the suspicious RCU usage warning.
Best regards,
Jozsef
The following changes since commit 9bb49a1f0354a2ed2854af40d7051188b9b85837:
netfilter: ipset: Fix race between namespace cleanup and gc in the list:set type (2024-06-04 09:23:46 +0200)
are available in the Git repository at:
git://blackhole.kfki.hu/nf 0eb942092ce49
for you to fetch changes up to 0eb942092ce49307042e4603917f1e126ca50394:
netfilter: ipset: Fix suspicious rcu_dereference_protected() (2024-06-14 12:20:33 +0200)
----------------------------------------------------------------
Jozsef Kadlecsik (1):
netfilter: ipset: Fix suspicious rcu_dereference_protected()
net/netfilter/ipset/ip_set_core.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
PATCH 1/1 netfilter: ipset: Fix suspicious rcu_dereference_protected()
When destroying all sets, we are either in pernet exit phase or are executing a "destroy all sets command" from userspace. The latter was taken into account in ip_set_dereference() (nfnetlink mutex is held), but the former was not. The patch adds the required check to rcu_dereference_protected() in ip_set_dereference().
--- net/netfilter/ipset/ip_set_core.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
net/netfilter/ipset/ip_set_core.c +6 -5
@@ -53,12 +53,13 @@ MODULE_DESCRIPTION("core IP set support");MODULE_ALIAS_NFNL_SUBSYS (NFNL_SUBSYS_IPSET );/* When the nfnl mutex or ip_set_ref_lock is held: */ -#define ip_set_dereference (p) \ - rcu_dereference_protected(p, \ +#define ip_set_dereference (inst) \ + rcu_dereference_protected((inst)->ip_set_list, \ lockdep_nfnl_is_held(NFNL_SUBSYS_IPSET) || \ - lockdep_is_held(&ip_set_ref_lock)) + lockdep_is_held(&ip_set_ref_lock) || \ + (inst)->is_deleted)#define ip_set (inst, id) \ - ip_set_dereference((inst)->ip_set_list)[id] + ip_set_dereference(inst)[id]#define ip_set_ref_netlink (inst,id) \ rcu_dereference_raw((inst)->ip_set_list)[id]#define ip_set_dereference_nfnl (p) \
@@ -1133,7 +1134,7 @@ static int ip_set_create(struct sk_buff *skb, const struct nfnl_info *info,if (!list) goto cleanup;/* nfnl mutex is held, both lists are valid */ - tmp =ip_set_dereference (inst->ip_set_list); + tmp =ip_set_dereference (inst);memcpy (list, tmp,sizeof (struct ip_set *) * inst->ip_set_max);rcu_assign_pointer (inst->ip_set_list, list);/* Make sure all current packets have passed through */
Signature · 1 line
2.39.2