summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2005-07-22 12:49:30 -0700
committerDavid S. Miller <davem@davemloft.net>2005-07-22 12:49:30 -0700
commit4c1217deeb148ff8ab838ba4f1875d0f52dea343 (patch)
tree9219e874ef71ac18b31e1028a5cde6d579c6fc23 /net
parent28e212fb360ce2568edd60b93d60683d5ad24146 (diff)
downloadlinux-4c1217deeb148ff8ab838ba4f1875d0f52dea343.tar.gz
linux-4c1217deeb148ff8ab838ba4f1875d0f52dea343.tar.bz2
linux-4c1217deeb148ff8ab838ba4f1875d0f52dea343.zip
[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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-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);
}