From: gregkh@suse.de
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
Zwane Mwaikambo <zwane@arm.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Randy Dunlap <rdunlap@xenotime.net>,
Dave Jones <davej@redhat.com>,
Chuck Wolber <chuckw@quantumlinux.com>,
torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk,
Martin Josefsson <gandalf@wlug.westbo.se>,
Patrick McHardy <kaber@trash.net>,
David Miller <davem@davemloft.net>,
Greg Kroah-Hartman <gregkh@suse.de>
Subject: [patch 14/26] {ip, nf}_conntrack_netlink: fix expectation notifier unregistration
Date: Tue, 4 Apr 2006 17:00:41 -0700 [thread overview]
Message-ID: <20060405000041.GO27049@kroah.com> (raw)
In-Reply-To: <20060404235927.GA27049@kroah.com>
[-- Attachment #1: ip.patch --]
[-- Type: text/plain, Size: 1679 bytes --]
From: Martin Josefsson <gandalf@wlug.westbo.se>
[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: Martin Josefsson <gandalf@wlug.westbo.se>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
net/ipv4/netfilter/ip_conntrack_netlink.c | 2 +-
net/netfilter/nf_conntrack_netlink.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- linux-2.6.16.1.orig/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ linux-2.6.16.1/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -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
--- linux-2.6.16.1.orig/net/netfilter/nf_conntrack_netlink.c
+++ linux-2.6.16.1/net/netfilter/nf_conntrack_netlink.c
@@ -1641,7 +1641,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
--
next prev parent reply other threads:[~2006-04-05 0:05 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20060404235634.696852000@quad.kroah.org>
2006-04-04 23:59 ` [patch 00/26] 2.6.16.2 -stable review gregkh
2006-04-04 23:59 ` [patch 01/26] tlclk: fix handling of device major gregkh
2006-04-04 23:59 ` [patch 02/26] USB: Fix irda-usb use after use gregkh
2006-04-05 0:16 ` David S. Miller
2006-04-06 0:55 ` [stable] " Greg KH
2006-04-05 0:22 ` Randy.Dunlap
2006-04-04 23:59 ` [patch 03/26] sysfs: zero terminate sysfs write buffers (CVE-2006-1055) gregkh
2006-04-05 15:09 ` Sergey Vlasov
2006-04-05 15:21 ` Al Viro
2006-04-05 15:38 ` Jon Smirl
2006-04-05 15:39 ` Al Viro
2006-04-05 15:43 ` Jon Smirl
2006-04-05 15:46 ` Al Viro
2006-04-05 16:18 ` Jon Smirl
2006-04-05 17:04 ` Al Viro
2006-04-05 19:58 ` Valdis.Kletnieks
2006-04-05 20:07 ` Greg KH
2006-04-06 1:05 ` Al Viro
2006-04-05 16:34 ` Jon Smirl
2006-04-05 17:02 ` Al Viro
2006-04-05 17:06 ` Jon Smirl
2006-04-05 17:27 ` Al Viro
2006-04-05 15:30 ` Jon Smirl
2006-04-05 18:52 ` [stable] " Greg KH
2006-04-04 23:59 ` [patch 04/26] USB: EHCI full speed ISO bugfixes gregkh
2006-04-04 23:59 ` [patch 05/26] USB: usbcore: usb_set_configuration oops (NULL ptr dereference) gregkh
2006-04-05 0:00 ` [patch 06/26] sbp2: fix spinlock recursion gregkh
2006-04-05 0:00 ` [patch 07/26] powerpc: make ISA floppies work again gregkh
2006-04-05 0:00 ` [patch 08/26] PCMCIA_SPECTRUM must select FW_LOADER gregkh
2006-04-05 0:00 ` [patch 09/26] pcmcia: permit single-character-identifiers gregkh
2006-04-05 0:00 ` [patch 10/26] opti9x - Fix compile without CONFIG_PNP gregkh
2006-04-05 0:00 ` [patch 11/26] IPOB: Move destructor from neigh->ops to neigh_param gregkh
2006-04-05 0:07 ` David S. Miller
2006-04-05 0:12 ` [stable] " Greg KH
2006-04-05 0:14 ` Roland Dreier
2006-04-05 0:17 ` David S. Miller
2006-04-05 0:42 ` Roland Dreier
2006-04-05 0:47 ` David S. Miller
2006-04-05 1:08 ` Roland Dreier
2006-04-05 7:58 ` Michael S. Tsirkin
2006-04-05 0:00 ` [patch 12/26] Mark longhaul driver as broken gregkh
2006-04-05 0:00 ` [patch 13/26] isicom must select FW_LOADER gregkh
2006-04-05 0:00 ` gregkh [this message]
2006-04-05 0:00 ` [patch 15/26] wrong error path in dup_fd() leading to oopses in RCU gregkh
2006-04-05 0:00 ` [patch 16/26] Fix the p4-clockmod N60 errata workaround gregkh
2006-04-05 0:00 ` [patch 17/26] Fix module refcount leak in __set_personality() gregkh
2006-04-05 0:00 ` [patch 18/26] fib_trie.c node freeing fix gregkh
2006-04-05 0:01 ` [patch 19/26] fbcon: Fix big-endian bogosity in slow_imageblit() gregkh
2006-04-05 0:01 ` [patch 20/26] drivers/net/wireless/ipw2200.c: fix an array overun gregkh
2006-04-05 0:01 ` [patch 21/26] Fix NULL pointer dereference in node_read_numastat() gregkh
2006-04-05 0:01 ` [patch 22/26] AIRO{,_CS} <-> CRYPTO fixes gregkh
2006-04-05 0:01 ` [patch 23/26] Add default entry for CTL Travel Master U553W gregkh
2006-04-05 0:01 ` [patch 24/26] hostap: Fix EAPOL frame encryption gregkh
2006-04-05 0:01 ` [patch 25/26] knfsd: Correct reserved reply space for read requests gregkh
2006-04-05 0:01 ` [patch 26/26] kdump proc vmcore size oveflow fix gregkh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060405000041.GO27049@kroah.com \
--to=gregkh@suse.de \
--cc=akpm@osdl.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=chuckw@quantumlinux.com \
--cc=davej@redhat.com \
--cc=davem@davemloft.net \
--cc=gandalf@wlug.westbo.se \
--cc=jmforbes@linuxtx.org \
--cc=kaber@trash.net \
--cc=linux-kernel@vger.kernel.org \
--cc=rdunlap@xenotime.net \
--cc=stable@kernel.org \
--cc=torvalds@osdl.org \
--cc=tytso@mit.edu \
--cc=zwane@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome