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

Commit e64a70be authored by Martin Josefsson's avatar Martin Josefsson Committed by David S. Miller
Browse files

[NETFILTER]: {ip,nf}_conntrack_netlink: fix expectation notifier unregistration 



This patch fixes expectation notifier unregistration on module unload to
use ip_conntrack_expect_unregister_notifier(). This bug causes a soft
lockup at the first expectation created after a rmmod ; insmod of this
module.

Should go into -stable as well.

Signed-off-by: default avatarMartin Josefsson <gandalf@wlug.westbo.se>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bcd1e830

net/ipv4/netfilter/ip_conntrack_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -1658,7 +1658,7 @@ static void __exit ctnetlink_exit(void) 
	printk("ctnetlink: unregistering from nfnetlink.\n");



#ifdef CONFIG_IP_NF_CONNTRACK_EVENTS

	ip_conntrack_unregister_notifier(&ctnl_notifier_exp);

	ip_conntrack_expect_unregister_notifier(&ctnl_notifier_exp);

	ip_conntrack_unregister_notifier(&ctnl_notifier);

#endif

net/netfilter/nf_conntrack_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -1687,7 +1687,7 @@ static void __exit ctnetlink_exit(void) 
	printk("ctnetlink: unregistering from nfnetlink.\n");



#ifdef CONFIG_NF_CONNTRACK_EVENTS

	nf_conntrack_unregister_notifier(&ctnl_notifier_exp);

	nf_conntrack_expect_unregister_notifier(&ctnl_notifier_exp);

	nf_conntrack_unregister_notifier(&ctnl_notifier);

#endif