Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffdce2cc authored by Russell King's avatar Russell King Committed by David S. Miller
Browse files

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: default avatarFugang Duan <B38611@freescale.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b7c9efa

drivers/net/ethernet/freescale/fec_main.c

+9 −6
Original line number Diff line number Diff line
@@ -2100,19 +2100,16 @@ static int fec_enet_alloc_buffers(struct net_device *ndev) 
		dma_addr_t addr;



		skb = netdev_alloc_skb(ndev, FEC_ENET_RX_FRSIZE);

		if (!skb) {

			fec_enet_free_buffers(ndev);

			return -ENOMEM;

		}

		if (!skb)

			goto err_alloc;



		addr = dma_map_single(&fep->pdev->dev, skb->data,

				FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE);

		if (dma_mapping_error(&fep->pdev->dev, addr)) {

			dev_kfree_skb(skb);

			fec_enet_free_buffers(ndev);

			if (net_ratelimit())

				netdev_err(ndev, "Rx DMA memory map failed\n");

			return -ENOMEM;

			goto err_alloc;

		}



		fep->rx_skbuff[i] = skb;
@@ -2134,6 +2131,8 @@ static int fec_enet_alloc_buffers(struct net_device *ndev) 
	bdp = fep->tx_bd_base;

	for (i = 0; i < fep->tx_ring_size; i++) {

		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_bufaddr = 0;
@@ -2151,6 +2150,10 @@ static int fec_enet_alloc_buffers(struct net_device *ndev) 
	bdp->cbd_sc |= BD_SC_WRAP;



	return 0;



 err_alloc:

	fec_enet_free_buffers(ndev);

	return -ENOMEM;

}



static int