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

Commit f998b6b1 authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik Committed by Pablo Neira Ayuso
Browse files

netfilter: ipset: Missing nfnl_lock()/nfnl_unlock() is added to ip_set_net_exit() 



Patch "netfilter: ipset: use nfnl_mutex_is_locked" is added the real
mutex locking check, which revealed the missing locking in ip_set_net_exit().

Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Reported-by: default avatar <syzbot+36b06f219f2439fe62e1@syzkaller.appspotmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 4750005a

net/netfilter/ipset/ip_set_core.c

+2 −0
Original line number Diff line number Diff line
@@ -2078,6 +2078,7 @@ ip_set_net_exit(struct net *net) 


	inst->is_deleted = true; /* flag for ip_set_nfnl_put */



	nfnl_lock(NFNL_SUBSYS_IPSET);

	for (i = 0; i < inst->ip_set_max; i++) {

		set = ip_set(inst, i);

		if (set) {
@@ -2085,6 +2086,7 @@ ip_set_net_exit(struct net *net) 
			ip_set_destroy_set(set);

		}

	}

	nfnl_unlock(NFNL_SUBSYS_IPSET);

	kfree(rcu_dereference_protected(inst->ip_set_list, 1));

}