diff options
| author |   Patrick McHardy <kaber@trash.net> | 2005-07-22 12:49:30 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2005-07-22 12:49:30 -0700 |
| commit | 4c1217deeb148ff8ab838ba4f1875d0f52dea343 (patch) | |
| tree | 9219e874ef71ac18b31e1028a5cde6d579c6fc23 /net/ipv6/netfilter/ip6_queue.c | |
| parent | [PKT_SCHED]: Kill TCF_META_ID_REALDEV from meta ematch. (diff) | |
| download | linux-dev-4c1217deeb148ff8ab838ba4f1875d0f52dea343.tar.xz linux-dev-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/ipv6/netfilter/ip6_queue.c')
| -rw-r--r-- | net/ipv6/netfilter/ip6_queue.c | 2 |
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); } |