openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: fec: fix missing kmalloc() failure check in fec_enet_alloc_buffers() 

fec_enet_alloc_buffers() assumes that kmalloc() will never fail, which
is an invalid assumption.  Fix this by implementing a common error
cleanup path, and use it to also clean up after failed bounce buffer
allocation.

Acked-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Russell King 2014-07-08 00:23:30 +01:00 committed by David S. Miller
parent 8b7c9efa01
commit ffdce2cc6a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/ethernet/freescale/fec_main.c
View File

@ -2100,19 +2100,16 @@ static int fec_enet_alloc_buffers(struct net_device *ndev)
dma_addr_t addr; dma_addr_t addr;
skb = netdev_alloc_skb(ndev, FEC_ENET_RX_FRSIZE); skb = netdev_alloc_skb(ndev, FEC_ENET_RX_FRSIZE);
if (!skb) { if (!skb)
fec_enet_free_buffers(ndev); goto err_alloc;
return -ENOMEM;
}
addr = dma_map_single(&fep->pdev->dev, skb->data, addr = dma_map_single(&fep->pdev->dev, skb->data,
FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE); FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE);
if (dma_mapping_error(&fep->pdev->dev, addr)) { if (dma_mapping_error(&fep->pdev->dev, addr)) {
dev_kfree_skb(skb); dev_kfree_skb(skb);
fec_enet_free_buffers(ndev);
if (net_ratelimit()) if (net_ratelimit())
netdev_err(ndev, "Rx DMA memory map failed\n"); netdev_err(ndev, "Rx DMA memory map failed\n");
return -ENOMEM; goto err_alloc;
} }
fep->rx_skbuff[i] = skb; fep->rx_skbuff[i] = skb;
@ -2134,6 +2131,8 @@ static int fec_enet_alloc_buffers(struct net_device *ndev)
bdp = fep->tx_bd_base; bdp = fep->tx_bd_base;
for (i = 0; i < fep->tx_ring_size; i++) { for (i = 0; i < fep->tx_ring_size; i++) {
fep->tx_bounce[i] = kmalloc(FEC_ENET_TX_FRSIZE, GFP_KERNEL); fep->tx_bounce[i] = kmalloc(FEC_ENET_TX_FRSIZE, GFP_KERNEL);
if (!fep->tx_bounce[i])
goto err_alloc;
bdp->cbd_sc = 0; bdp->cbd_sc = 0;
bdp->cbd_bufaddr = 0; bdp->cbd_bufaddr = 0;
@ -2151,6 +2150,10 @@ static int fec_enet_alloc_buffers(struct net_device *ndev)
bdp->cbd_sc |= BD_SC_WRAP; bdp->cbd_sc |= BD_SC_WRAP;
return 0; return 0;
err_alloc:
fec_enet_free_buffers(ndev);
return -ENOMEM;
} }
static int static int