lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

skge: fix invalid value passed to pci_unmap_sigle

Browse Source 
In my patch c194992cbe ("skge: fix
broken driver") I didn't fix the skge bug correctly. The value of the
new mapping (not old) was passed to pci_unmap_single.

If we enable CONFIG_DMA_API_DEBUG, it results in this warning:
WARNING: CPU: 0 PID: 0 at lib/dma-debug.c:986 check_sync+0x4c4/0x580()
skge 0000:02:07.0: DMA-API: device driver tries to sync DMA memory it has
not allocated [device address=0x000000023a0096c0] [size=1536 bytes]

This patch makes the skge driver pass the correct value to
pci_unmap_single and fixes the warning. It copies the old descriptor to
on-stack variable "ee" and unmaps it if mapping of the new descriptor
succeeded.

This patch should be backported to 3.11-stable.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Reported-by: Francois Romieu <romieu@fr.zoreil.com>
Tested-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Mikulas Patocka
2013-09-20 13:53:22 -04:00
committed by David S. Miller
parent 8d65b1190d
commit 3361dc9538
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/marvell/skge.c
View File

@@ -3086,13 +3086,16 @@ static struct sk_buff *skge_rx_get(struct net_device *dev,
PCI_DMA_FROMDEVICE); PCI_DMA_FROMDEVICE);
skge_rx_reuse(e, skge->rx_buf_size); skge_rx_reuse(e, skge->rx_buf_size);
} else { } else {
struct skge_element ee;
struct sk_buff *nskb; struct sk_buff *nskb;
nskb = netdev_alloc_skb_ip_align(dev, skge->rx_buf_size); nskb = netdev_alloc_skb_ip_align(dev, skge->rx_buf_size);
if (!nskb) if (!nskb)
goto resubmit; goto resubmit;
skb = e->skb; ee = *e;
skb = ee.skb;
prefetch(skb->data); prefetch(skb->data);
if (skge_rx_setup(skge, e, nskb, skge->rx_buf_size) < 0) { if (skge_rx_setup(skge, e, nskb, skge->rx_buf_size) < 0) {
@@ -3101,8 +3104,8 @@ static struct sk_buff *skge_rx_get(struct net_device *dev,
} }
pci_unmap_single(skge->hw->pdev, pci_unmap_single(skge->hw->pdev,
dma_unmap_addr(e, mapaddr), dma_unmap_addr(&ee, mapaddr),
dma_unmap_len(e, maplen), dma_unmap_len(&ee, maplen),
PCI_DMA_FROMDEVICE); PCI_DMA_FROMDEVICE);
} }