2015-08-03 02:41:13

by Jia-Ju Bai

Subject: [PATCH] e100: Release skb when DMA mapping is failed in e100_xmit_prepare

When pci_dma_mapping_error in e100_xmit_prepare is failed, the skb buffer
allocated by netdev_alloc_skb_ip_align in e100_rx_alloc_skb is not
released, which causes a possible resource leak.
This patch adds error handling code to fix it.

Signed-off-by: Jia-Ju Bai <[email protected]>
---
drivers/net/ethernet/intel/e100.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index d2657a4..cc90616 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -1770,8 +1770,11 @@ static int e100_xmit_prepare(struct nic *nic, struct cb *cb,
dma_addr = pci_map_single(nic->pdev,
skb->data, skb->len, PCI_DMA_TODEVICE);
/* If we can't map the skb, have the upper layer try later */
- if (pci_dma_mapping_error(nic->pdev, dma_addr))
+ if (pci_dma_mapping_error(nic->pdev, dma_addr)) {
+ dev_kfree_skb_any(skb);
+ skb = NULL;
return -ENOMEM;
+ }

/*
* Use the last 4 bytes of the SKB payload packet as the CRC, used for
--
1.7.9.5

2015-08-18 02:54:05

by Brown, Aaron F

Subject: RE: [Intel-wired-lan] [PATCH] e100: Release skb when DMA mapping is failed in e100_xmit_prepare

> From: Intel-wired-lan [mailto:[email protected]] On
> Behalf Of Jia-Ju Bai
> Sent: Sunday, August 02, 2015 7:41 PM
> To: Kirsher, Jeffrey T; Brandeburg, Jesse
> Cc: [email protected]; Jia-Ju Bai; [email protected];
> [email protected]
> Subject: [Intel-wired-lan] [PATCH] e100: Release skb when DMA mapping is
> failed in e100_xmit_prepare
>
> When pci_dma_mapping_error in e100_xmit_prepare is failed, the skb buffer
> allocated by netdev_alloc_skb_ip_align in e100_rx_alloc_skb is not
> released, which causes a possible resource leak.
> This patch adds error handling code to fix it.
>
> Signed-off-by: Jia-Ju Bai <[email protected]>
> ---
> drivers/net/ethernet/intel/e100.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)

Tested-by: Aaron Brown <[email protected]>