Skip to contentSkip to conversation

: Fix deadlock in ip6_queue

PATCH Applied Patrick McHardy 2 participants 3 messages Jul 22, 2005 – Jul 23, 2005 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/5 : Fix deadlock in ip6_queue

Hi Dave,

following are a couple of patches for 2.6.13. I've CCed [email protected] on all patches that I think should also go in -stable.

Regards
Patrick

[NETFILTER]: Fix deadlock in ip6_queue

Already fixed in ip_queue, ip6_queue was missed.

---
commit bbdfd0b519cf535692a25adc5aa7cab3079220b4
tree 19d321b73864f5078ed2638e227575d0998fe64e
parent f60f700876cd51de9de69f3a3c865d95e287a24d
author Patrick McHardy <[email protected]> Fri, 22 Jul 2005 09:21:59 +0200 committer Patrick McHardy <[email protected]> Fri, 22 Jul 2005 09:21:59 +0200

 net/ipv6/netfilter/ip6_queue.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
net/ipv6/netfilter/ip6_queue.c +2 -0
@@ -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);
 }
 

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw
Quoted 9 lines · Greg KH
Quoted 5 lines · Patrick McHardy

Hi Dave,

following are a couple of patches for 2.6.13. I've CCed [email protected] on all patches that I think should also go in -stable.

-stable only received 3 of these, is that correct?

Yes, the others fixed one unimportant bug and one bug introduced in 2.6.13-rc.

Quoted 2 lines

I'll hold off on adding these to the queue until they go into mainline. When that happens, could you please let us know?

They just hit Linus's tree.

Regards
Patrick