Skip to contentSkip to conversation

ip_conntrack_netlink : fix expectation notifier unregistration

PATCH Applied Martin Josefsson 2 participants 2 messages Mar 26, 2006 – Mar 28, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ip_conntrack_netlink : fix expectation notifier unregistration

Same fix as for the notifier unregistration bug in nf_conntrack_netlink.

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.

net/ipv4/netfilter/ip_conntrack_netlink.c +1 -1
@@ -1619,7 +1619,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
 
Signature · 1 line
/Martin
#1 lore raw
Quoted 8 lines · Martin Josefsson

Same fix as for the notifier unregistration bug in nf_conntrack_netlink.

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.

Applied to my tree, I'll pass them on soon (probably tonight).