summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHarald Welte <laforge@netfilter.org>2005-11-03 20:03:24 +0100
committerArnaldo Carvalho de Melo <acme@mandriva.com>2005-11-05 16:43:29 -0200
commit1758ee0ea26561943813c5f5a7b27272f2cbc4cf (patch)
tree2190113eca8ec18da862a25fc589f5d8cf678a0b /net
parent433a4d3b5456dec5bcca5a0f236bf622da1267b3 (diff)
downloadop-kernel-dev-1758ee0ea26561943813c5f5a7b27272f2cbc4cf.zip
op-kernel-dev-1758ee0ea26561943813c5f5a7b27272f2cbc4cf.tar.gz
[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 <laforge@netfilter.org> Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_queue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
index d10d552..d3a4f30 100644
--- 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;
OpenPOWER on IntegriCloud