evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tg3: fix tigon3_dma_hwbug_workaround()

Browse source 
Ari got kernel panics using tg3 NIC, and bisected to 2669069aac "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 <ari.m.savolainen@gmail.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2011-10-22 03:29:53 -04:00 • committed by David S. Miller
parent 580043a27d
commit f7ff19871b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/tg3.c
View file

@ -6029,12 +6029,12 @@ static void tg3_tx_skb_unmap(struct tg3_napi *tnapi, u32 entry, int last)
/* Workaround 4GB and 40-bit hardware DMA bugs. */ /* Workaround 4GB and 40-bit hardware DMA bugs. */
static int tigon3_dma_hwbug_workaround(struct tg3_napi *tnapi, static int tigon3_dma_hwbug_workaround(struct tg3_napi *tnapi,
struct sk_buff *skb, struct sk_buff **pskb,
u32 *entry, u32 *budget, u32 *entry, u32 *budget,
u32 base_flags, u32 mss, u32 vlan) u32 base_flags, u32 mss, u32 vlan)
{ {
struct tg3 *tp = tnapi->tp; struct tg3 *tp = tnapi->tp;
struct sk_buff *new_skb; struct sk_buff *new_skb, *skb = *pskb;
dma_addr_t new_addr = 0; dma_addr_t new_addr = 0;
int ret = 0; int ret = 0;
@ -6076,7 +6076,7 @@ static int tigon3_dma_hwbug_workaround(struct tg3_napi *tnapi,
} }
dev_kfree_skb(skb); dev_kfree_skb(skb);
*pskb = new_skb;
return ret; return ret;
} }
@ -6305,7 +6305,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
*/ */
entry = tnapi->tx_prod; entry = tnapi->tx_prod;
budget = tg3_tx_avail(tnapi); 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)) base_flags, mss, vlan))
goto out_unlock; goto out_unlock;
} }