* [NETFILTER 2.4 2/6]: Fix deadlock with ip_queue/ip6_queue
@ 2005-08-01 0:42 Patrick McHardy
0 siblings, 0 replies; only message in thread
From: Patrick McHardy @ 2005-08-01 0:42 UTC (permalink / raw)
To: David S. Miller; +Cc: Netfilter Development Mailinglist
[-- Attachment #1: 2.diff --]
[-- Type: text/x-patch, Size: 1316 bytes --]
[NETFILTER]: Fix deadlock with ip_queue/ip6_queue
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
commit 36d73751283413992a12837f7a6e4116b9e70d3f
tree cd19a0c9a2e183b887ef5fc8cfec8682fe3b24e3
parent 2a330e4e1da97267e1dd4a2ed3f8cd7cabdf21ca
author Patrick McHardy <kaber@trash.net> Sun, 31 Jul 2005 18:48:38 +0200
committer Patrick McHardy <kaber@trash.net> Sun, 31 Jul 2005 18:48:38 +0200
net/ipv4/netfilter/ip_queue.c | 2 ++
net/ipv6/netfilter/ip6_queue.c | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
--- a/net/ipv4/netfilter/ip_queue.c
+++ b/net/ipv4/netfilter/ip_queue.c
@@ -62,7 +62,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);
}
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@ -68,7 +68,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);
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-08-01 0:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-08-01 0:42 [NETFILTER 2.4 2/6]: Fix deadlock with ip_queue/ip6_queue Patrick McHardy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.