diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-06-05 18:44:59 -0500 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2008-06-09 11:27:04 -0700 |
| commit | 1965da94d854758b4beebfeadcfae480039cbb76 (patch) | |
| tree | d52be3c219510987b94c1f3f4c310fa459560cad /drivers | |
| parent | e44f560e6d3f351c654a8d8b3dcdeb5f2bd81b5b (diff) | |
atl1: fix 4G memory corruption bug
upstream commit: aefdbf1a3b832a580a50cf3d1dcbb717be7cbdbe
When using 4+ GB RAM and SWIOTLB is active, the driver corrupts
memory by writing an skb after the relevant DMA page has been
unmapped. Although this doesn't happen when *not* using bounce
buffers, clearing the pointer to the DMA page after unmapping
it fixes the problem.
http://marc.info/?t=120861317000005&r=2&w=2
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
[jacliburn@bellsouth.net: backport to 2.6.25.4]
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/atl1/atl1_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c index 129b8b3aa77..68be4e1c69a 100644 --- a/drivers/net/atl1/atl1_main.c +++ b/drivers/net/atl1/atl1_main.c @@ -1334,6 +1334,7 @@ rrd_ok: /* Good Receive */ pci_unmap_page(adapter->pdev, buffer_info->dma, buffer_info->length, PCI_DMA_FROMDEVICE); + buffer_info->dma = 0; skb = buffer_info->skb; length = le16_to_cpu(rrd->xsz.xsum_sz.pkt_size); |