summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2005-07-22 09:35:34 +0200
committerChris Wright <chrisw@osdl.org>2005-08-05 00:04:18 -0700
commit2311be883f42fad2170ce288cfa477dc0ddb97be (patch)
tree343e8e9116c9178bd6cf3833326b00693ccc1b55
parent4717ecd49ce5c556d38e8c7b6fdc9fac5d35c00e (diff)
downloadlinux-stable-2311be883f42fad2170ce288cfa477dc0ddb97be.tar.gz
linux-stable-2311be883f42fad2170ce288cfa477dc0ddb97be.tar.bz2
linux-stable-2311be883f42fad2170ce288cfa477dc0ddb97be.zip
[PATCH] Fix deadlock in ip6_queue
[NETFILTER]: Fix deadlock in ip6_queue Already fixed in ip_queue, ip6_queue was missed. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--net/ipv6/netfilter/ip6_queue.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
index 750943e2d34e..5493180f0d44 100644
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@ -76,7 +76,9 @@ static DECLARE_MUTEX(ipqnl_sem);
static void
ipq_issue_verdict(struct ipq_queue_entry *entry, int verdict)
{
+ local_bh_disable();
nf_reinject(entry->skb, entry->info, verdict);
+ local_bh_enable();
kfree(entry);
}