From: Eric Dumazet Date: Sat, 22 Oct 2011 07:29:53 +0000 (-0400) Subject: tg3: fix tigon3_dma_hwbug_workaround() X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~670 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f7226c4d1e0384144e4eff597710897b18f28ac5;p=users%2Fjedix%2Flinux-maple.git tg3: fix tigon3_dma_hwbug_workaround() Ari got kernel panics using tg3 NIC, and bisected to 2669069aacc9 "tg3: enable transmit time stamping." This is because tigon3_dma_hwbug_workaround() might alloc a new skb and free the original. We panic when skb_tx_timestamp() is called on freed skb. Reported-by: Ari Savolainen (cherry picked from commit f7ff19871bb4a3451e1ca2cf660bf633018cfbec) Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Joe Jin --- diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 06f66eca57a1..77adaf4ec464 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -6535,12 +6535,12 @@ static void tg3_tx_skb_unmap(struct tg3_napi *tnapi, u32 entry, int last) /* Workaround 4GB and 40-bit hardware DMA bugs. */ static int tigon3_dma_hwbug_workaround(struct tg3_napi *tnapi, - struct sk_buff *skb, + struct sk_buff **pskb, u32 *entry, u32 *budget, u32 base_flags, u32 mss, u32 vlan) { struct tg3 *tp = tnapi->tp; - struct sk_buff *new_skb; + struct sk_buff *new_skb, *skb = *pskb; dma_addr_t new_addr = 0; int ret = 0; @@ -6582,7 +6582,7 @@ static int tigon3_dma_hwbug_workaround(struct tg3_napi *tnapi, } dev_kfree_skb(skb); - + *pskb = new_skb; return ret; } @@ -6813,7 +6813,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) */ entry = tnapi->tx_prod; budget = tg3_tx_avail(tnapi); - if (tigon3_dma_hwbug_workaround(tnapi, skb, &entry, &budget, + if (tigon3_dma_hwbug_workaround(tnapi, &skb, &entry, &budget, base_flags, mss, vlan)) goto out_unlock; }