Skip to content

Commit 7433b6d

Browse files
Jozsef KadlecsikFlorian Westphal
authored andcommitted
netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
Kyle Zeng reported that there is a race between IPSET_CMD_ADD and IPSET_CMD_SWAP in netfilter/ip_set, which can lead to the invocation of `__ip_set_put` on a wrong `set`, triggering the `BUG_ON(set->ref == 0);` check in it. The race is caused by using the wrong reference counter, i.e. the ref counter instead of ref_netlink. Fixes: 24e2278 ("netfilter: ipset: Add schedule point in call_ad().") Reported-by: Kyle Zeng <zengyhkyle@gmail.com> Closes: https://lore.kernel.org/netfilter-devel/ZPZqetxOmH+w%2Fmyc@westworld/#r Tested-by: Kyle Zeng <zengyhkyle@gmail.com> Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org> Signed-off-by: Florian Westphal <fw@strlen.de>
1 parent cf5000a commit 7433b6d

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

net/netfilter/ipset/ip_set_core.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,14 @@ __ip_set_put(struct ip_set *set)
682682
/* set->ref can be swapped out by ip_set_swap, netlink events (like dump) need
683683
* a separate reference counter
684684
*/
685+
static void
686+
__ip_set_get_netlink(struct ip_set *set)
687+
{
688+
write_lock_bh(&ip_set_ref_lock);
689+
set->ref_netlink++;
690+
write_unlock_bh(&ip_set_ref_lock);
691+
}
692+
685693
static void
686694
__ip_set_put_netlink(struct ip_set *set)
687695
{
@@ -1693,11 +1701,11 @@ call_ad(struct net *net, struct sock *ctnl, struct sk_buff *skb,
16931701

16941702
do {
16951703
if (retried) {
1696-
__ip_set_get(set);
1704+
__ip_set_get_netlink(set);
16971705
nfnl_unlock(NFNL_SUBSYS_IPSET);
16981706
cond_resched();
16991707
nfnl_lock(NFNL_SUBSYS_IPSET);
1700-
__ip_set_put(set);
1708+
__ip_set_put_netlink(set);
17011709
}
17021710

17031711
ip_set_lock(set);

0 commit comments

Comments
 (0)