releases/2.6.14.3/nf_queue-fix-oops-when-no-queue-handler-registered.patch

   1 From stable-bounces@linux.kernel.org  Tue Nov 15 04:32:49 2005
   2 Date: Tue, 15 Nov 2005 13:32:36 +0100
   3 From: Harald Welte <laforge@netfilter.org>
   4 To: Stable Kernel <stable@kernel.org>
   5 Cc:
   6 Subject: [PATCH] [NETFILTER] nf_queue: Fix Ooops when no queue handler registered
   7
   8 With the new nf_queue generalization in 2.6.14, we've introduced a bug
   9 that causes an oops as soon as a packet is queued but no queue handler
  10 registered.  This patch fixes it.
  11
  12 Signed-off-by: Harald Welte <laforge@netfilter.org>
  13 Signed-off-by: Chris Wright <chrisw@osdl.org>
  14 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  15 ---
  16  net/netfilter/nf_queue.c |    2 +-
  17  1 file changed, 1 insertion(+), 1 deletion(-)
  18
  19 --- linux-2.6.14.2.orig/net/netfilter/nf_queue.c
  20 +++ linux-2.6.14.2/net/netfilter/nf_queue.c
  21 @@ -117,7 +117,7 @@ int nf_queue(struct sk_buff **skb,
  22
  23         /* QUEUE == DROP if noone is waiting, to be safe. */
  24         read_lock(&queue_handler_lock);
  25 -       if (!queue_handler[pf]->outfn) {
  26 +       if (!queue_handler[pf] || !queue_handler[pf]->outfn) {
  27                 read_unlock(&queue_handler_lock);
  28                 kfree_skb(*skb);
  29                 return 1;