| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061 |
- From 2cee757eaf5cc6175bc0ac7b0b808794124ec40a Mon Sep 17 00:00:00 2001
- From: Hauke Mehrtens <[email protected]>
- Date: Mon, 17 Feb 2020 23:40:14 +0100
- Subject: [PATCH 1/3] ag71xx: Handle allocation errors in ag71xx_rings_init()
- Free the allocated resources in ag71xx_rings_init() in case
- ag71xx_ring_rx_init() returns an error.
- This is only a potential problem, I did not ran into this one.
- Signed-off-by: Hauke Mehrtens <[email protected]>
- Fixes: d51b6ce441d3 ("net: ethernet: add ag71xx driver")
- ---
- drivers/net/ethernet/atheros/ag71xx.c | 22 ++++++++++++++++++----
- 1 file changed, 18 insertions(+), 4 deletions(-)
- --- a/drivers/net/ethernet/atheros/ag71xx.c
- +++ b/drivers/net/ethernet/atheros/ag71xx.c
- @@ -1133,6 +1133,7 @@ static int ag71xx_rings_init(struct ag71
- struct ag71xx_ring *tx = &ag->tx_ring;
- struct ag71xx_ring *rx = &ag->rx_ring;
- int ring_size, tx_size;
- + int ret;
-
- ring_size = BIT(tx->order) + BIT(rx->order);
- tx_size = BIT(tx->order);
- @@ -1145,9 +1146,8 @@ static int ag71xx_rings_init(struct ag71
- ring_size * AG71XX_DESC_SIZE,
- &tx->descs_dma, GFP_KERNEL);
- if (!tx->descs_cpu) {
- - kfree(tx->buf);
- - tx->buf = NULL;
- - return -ENOMEM;
- + ret = -ENOMEM;
- + goto err_free_buf;
- }
-
- rx->buf = &tx->buf[tx_size];
- @@ -1155,7 +1155,21 @@ static int ag71xx_rings_init(struct ag71
- rx->descs_dma = tx->descs_dma + tx_size * AG71XX_DESC_SIZE;
-
- ag71xx_ring_tx_init(ag);
- - return ag71xx_ring_rx_init(ag);
- + ret = ag71xx_ring_rx_init(ag);
- + if (ret)
- + goto err_free_dma;
- +
- + return 0;
- +
- +err_free_dma:
- + dma_free_coherent(&ag->pdev->dev, ring_size * AG71XX_DESC_SIZE,
- + tx->descs_cpu, tx->descs_dma);
- + rx->buf = NULL;
- +err_free_buf:
- + kfree(tx->buf);
- + tx->buf = NULL;
- +
- + return ret;
- }
-
- static void ag71xx_rings_free(struct ag71xx *ag)
|
