tg3: Enforce DMA mapping / skb assignment ordering
Subsystems (2)
PATCH 1/12 tg3: Enforce DMA mapping / skb assignment ordering
Michael Chan noted that there is nothing in the code that would prevent the compiler from delaying the access of the "mapping" member of the newly arrived packet until much later. If this happened after the skb = NULL assignment, it is possible for the driver to pass a bad dma_addr value to pci_unmap_single(). To enforce this ordering, we need a write memory barrier. The pairing read memory barrier already exists in tg3_rx_prodring_xfer() under the comments starting with "Ensure that updates to the...".
--- drivers/net/tg3.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
drivers/net/tg3.c +7 -2
@@ -4659,11 +4659,16 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)if (skb_size <0 ) goto drop_it; - ri->skb =NULL ; -pci_unmap_single (tp->pdev, dma_addr, skb_size,PCI_DMA_FROMDEVICE ); +/* Ensure that the update to the skb happens +* after the usage of the old DMA mapping. +*/ +smp_wmb (); + + ri->skb =NULL ; +skb_put (skb, len); }else {struct sk_buff *copy_skb;
--
1.6.4.4
--- drivers/net/tg3.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
drivers/net/tg3.c +7 -2
@@ -4659,11 +4659,16 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)if (skb_size <0 ) goto drop_it; - ri->skb =NULL ; -pci_unmap_single (tp->pdev, dma_addr, skb_size,PCI_DMA_FROMDEVICE ); +/* Ensure that the update to the skb happens +* after the usage of the old DMA mapping. +*/ +smp_wmb (); + + ri->skb =NULL ; +skb_put (skb, len); }else {struct sk_buff *copy_skb;
Signature · 1 line
1.6.4.4
David Miller
maintainerFrom: "Matt Carlson" <[email protected]>
Date: Wed, 17 Feb 2010 17:16:54 -0800
You're providing the patch twice here:
Quoted 9 lines
--- drivers/net/tg3.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)drivers/net/tg3.c +0
-0@@ -4659,11 +4659,16 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
...
Quoted 2 lines
--
1.6.4.4
...
drivers/net/tg3.c static int tg3_rx(struct tg3_napi *tnapi, int budget)
Quoted 9 lines
--- drivers/net/tg3.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)drivers/net/tg3.c +0
-0@@ -4659,11 +4659,16 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
I'll fix this up but please make amends to ensure this doesn't happen again.