[net-next 11/14] igbvf: Check for error on dma_map_single call
flat view
STALE5108d
SUPERSEDED: 1 (0M)
From: Jeff Kirsher <hidden>
Date: 2012-10-26 11:58:29
Subsystem:
intel ethernet drivers, networking drivers, the rest · Maintainers:
Tony Nguyen, Przemek Kitszel, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Revision v1 of 102 in this series; 1 review trailer.
Revisions (102)
- v1
- v2 [diff vs current]
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v2 [diff vs current]
- v1
- v1
- v2 [diff vs current]
- v2 [diff vs current]
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1 current
- v2 [diff vs current]
- v1
- v1
- v1
- v2 [diff vs current]
- v1
- v2 [diff vs current]
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v2 [diff vs current]
- v1
- v1
- v1
- v2 [diff vs current]
- v1
- v2 [diff vs current]
- v1
- v1
- v2 [diff vs current]
- v1
- v1
- v1
- v1
- v1
- v1
- v2 [diff vs current]
- v1
- v1
- v2 [diff vs current]
- v3 [diff vs current]
- v4 [diff vs current]
- v2 [diff vs current]
- v5 [diff vs current]
- v1
- v1
- v1
- v2 [diff vs current]
- v1
- v1
- v2 [diff vs current]
- v3 [diff vs current]
- v1
- v2 [diff vs current]
- v1
- v1
- v1
- v2 [diff vs current]
- v1
- v2 [diff vs current]
- v3 [diff vs current]
- v1
- v1
- v1
- v2 [diff vs current]
- v1
- v1
- v1
- v1
- v1
- v2 [diff vs current]
- v1
- v1
- v1
- v1
- v1
From: Greg Rose <redacted> Ignoring the return value from a call to the kernel dma_map API functions can cause data corruption and system instability. Check the return value and take appropriate action. Signed-off-by: Greg Rose <redacted> Tested-by: Sibai Li <redacted> Signed-off-by: Jeff Kirsher <redacted> --- drivers/net/ethernet/intel/igbvf/netdev.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index 0ac11f5..4051ec4 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c@@ -184,6 +184,13 @@ static void igbvf_alloc_rx_buffers(struct igbvf_ring *rx_ring, buffer_info->page_offset, PAGE_SIZE / 2, DMA_FROM_DEVICE); + if (dma_mapping_error(&pdev->dev, + buffer_info->page_dma)) { + __free_page(buffer_info->page); + buffer_info->page = NULL; + dev_err(&pdev->dev, "RX DMA map failed\n"); + break; + } } if (!buffer_info->skb) {
@@ -197,6 +204,12 @@ static void igbvf_alloc_rx_buffers(struct igbvf_ring *rx_ring, buffer_info->dma = dma_map_single(&pdev->dev, skb->data, bufsz, DMA_FROM_DEVICE); + if (dma_mapping_error(&pdev->dev, buffer_info->dma)) { + dev_kfree_skb(buffer_info->skb); + buffer_info->skb = NULL; + dev_err(&pdev->dev, "RX DMA map failed\n"); + goto no_buffers; + } } /* Refresh the desc even if buffer_addrs didn't change because * each write-back erases this info. */
--
1.7.11.7