From e7a56cf1d43e2e07f88cde13099ae69225276d08 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Mon, 7 Nov 2005 09:18:08 +0000 Subject: [PATCH] [NETFILTER] nf_queue: Fix Ooops when no queue handler registered This is a regression introduced in 2.6.14. net-nf_queue-oops.patch. (Closes: #337713) svn path=/dists/trunk/linux-2.6/; revision=4736 --- debian/changelog | 5 +++- debian/patches-debian/net-nf_queue-oops.patch | 26 +++++++++++++++++++ debian/patches-debian/series/2.6.14-3 | 1 + 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 debian/patches-debian/net-nf_queue-oops.patch diff --git a/debian/changelog b/debian/changelog index 3d70eae83..533154b08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,12 +24,15 @@ linux-2.6 (2.6.14-3) UNRELEASED; urgency=low automatically compenste for. (Closes: #336450) * Redisable CONFIG_SOFTWARE_SUSPEND on ppc/miboot as it required CONFIG_PM to compile. + * [NETFILTER] nf_queue: Fix Ooops when no queue handler registered + This is a regression introduced in 2.6.14. + net-nf_queue-oops.patch. (Closes: #337713) [ dann frazier ] * net-ipconntrack-nat-fix.patch - fix compilation of ip_conntrack_helper_pptp.c when NAT is disabled. (Closes: #336431) - -- Simon Horman Mon, 7 Nov 2005 18:05:10 +0900 + -- Simon Horman Mon, 7 Nov 2005 18:17:47 +0900 linux-2.6 (2.6.14-2) unstable; urgency=low diff --git a/debian/patches-debian/net-nf_queue-oops.patch b/debian/patches-debian/net-nf_queue-oops.patch new file mode 100644 index 000000000..3b1b52be1 --- /dev/null +++ b/debian/patches-debian/net-nf_queue-oops.patch @@ -0,0 +1,26 @@ +From: Harald Welte +Date: Thu, 3 Nov 2005 19:03:24 +0000 (+0100) +Subject: [NETFILTER] nf_queue: Fix Ooops when no queue handler registered +X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/acme/net-2.6.git;a=commitdiff;h=1758ee0ea26561943813c5f5a7b27272f2cbc4cf + + [NETFILTER] nf_queue: Fix Ooops when no queue handler registered + + With the new nf_queue generalization in 2.6.14, we've introduced a bug + that causes an oops as soon as a packet is queued but no queue handler + registered. This patch fixes it. + + Signed-off-by: Harald Welte + Signed-off-by: Arnaldo Carvalho de Melo +--- + +--- a/net/netfilter/nf_queue.c ++++ b/net/netfilter/nf_queue.c +@@ -117,7 +117,7 @@ int nf_queue(struct sk_buff **skb, + + /* QUEUE == DROP if noone is waiting, to be safe. */ + read_lock(&queue_handler_lock); +- if (!queue_handler[pf]->outfn) { ++ if (!queue_handler[pf] || !queue_handler[pf]->outfn) { + read_unlock(&queue_handler_lock); + kfree_skb(*skb); + return 1; diff --git a/debian/patches-debian/series/2.6.14-3 b/debian/patches-debian/series/2.6.14-3 index bb5d26a53..91ece844c 100644 --- a/debian/patches-debian/series/2.6.14-3 +++ b/debian/patches-debian/series/2.6.14-3 @@ -1 +1,2 @@ + net-ipconntrack-nat-fix.patch ++ net-nf_queue-oops.patch