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

Commit 38fb0afc authored by Patrick McHardy's avatar Patrick McHardy
Browse files

netfilter: nf_conntrack: fix crash when unloading helpers 



Commit ea781f19 (netfilter: nf_conntrack: use SLAB_DESTROY_BY_RCU and)
get rid of call_rcu() was missing one conversion to the hlist_nulls
functions, causing a crash when unloading conntrack helper modules.

Reported-and-tested-by: default avatarMariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent b6f0a365

net/netfilter/nf_conntrack_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static void __nf_conntrack_helper_unregister(struct nf_conntrack_helper *me, 
	}



	/* Get rid of expecteds, set helpers to NULL. */

	hlist_for_each_entry(h, nn, &net->ct.unconfirmed, hnnode)

	hlist_nulls_for_each_entry(h, nn, &net->ct.unconfirmed, hnnode)

		unhelp(h, me);

	for (i = 0; i < nf_conntrack_htable_size; i++) {

		hlist_nulls_for_each_entry(h, nn, &net->ct.hash[i], hnnode)