From: Frank Blaschka <frank.blaschka@de.ibm.com>
Date: Mon, 3 Mar 2008 20:16:04 +0000 (-0800)
Subject: [NET]: Fix race in generic address resolution.
X-Git-Tag: v2.6.25-rc4~2^2~8
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7e36763b2c204d59de4e88087f84a2c0c8421f25;p=linux-2.6-omap-h63xx.git

[NET]: Fix race in generic address resolution.

neigh_update sends skb from neigh->arp_queue while neigh_timer_handler
has increased skbs refcount and calls solicit with the
skb. neigh_timer_handler should not increase skbs refcount but make a
copy of the skb and do solicit with the copy.

Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index aef01533dfb..d9a02b2cc28 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -839,7 +839,7 @@ static void neigh_timer_handler(unsigned long arg)
 		struct sk_buff *skb = skb_peek(&neigh->arp_queue);
 		/* keep skb alive even if arp_queue overflows */
 		if (skb)
-			skb_get(skb);
+			skb = skb_copy(skb, GFP_ATOMIC);
 		write_unlock(&neigh->lock);
 		neigh->ops->solicit(neigh, skb);
 		atomic_inc(&neigh->probes);