1 From 2cee757eaf5cc6175bc0ac7b0b808794124ec40a Mon Sep 17 00:00:00 2001
2 From: Hauke Mehrtens <hauke@hauke-m.de>
3 Date: Mon, 17 Feb 2020 23:40:14 +0100
4 Subject: [PATCH 1/3] ag71xx: Handle allocation errors in ag71xx_rings_init()
6 Free the allocated resources in ag71xx_rings_init() in case
7 ag71xx_ring_rx_init() returns an error.
9 This is only a potential problem, I did not ran into this one.
11 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
12 Fixes: d51b6ce441d3 ("net: ethernet: add ag71xx driver")
14 drivers/net/ethernet/atheros/ag71xx.c | 22 ++++++++++++++++++----
15 1 file changed, 18 insertions(+), 4 deletions(-)
17 --- a/drivers/net/ethernet/atheros/ag71xx.c
18 +++ b/drivers/net/ethernet/atheros/ag71xx.c
19 @@ -1133,6 +1133,7 @@ static int ag71xx_rings_init(struct ag71
20 struct ag71xx_ring *tx = &ag->tx_ring;
21 struct ag71xx_ring *rx = &ag->rx_ring;
22 int ring_size, tx_size;
25 ring_size = BIT(tx->order) + BIT(rx->order);
26 tx_size = BIT(tx->order);
27 @@ -1145,9 +1146,8 @@ static int ag71xx_rings_init(struct ag71
28 ring_size * AG71XX_DESC_SIZE,
29 &tx->descs_dma, GFP_KERNEL);
38 rx->buf = &tx->buf[tx_size];
39 @@ -1155,7 +1155,21 @@ static int ag71xx_rings_init(struct ag71
40 rx->descs_dma = tx->descs_dma + tx_size * AG71XX_DESC_SIZE;
42 ag71xx_ring_tx_init(ag);
43 - return ag71xx_ring_rx_init(ag);
44 + ret = ag71xx_ring_rx_init(ag);
51 + dma_free_coherent(&ag->pdev->dev, ring_size * AG71XX_DESC_SIZE,
52 + tx->descs_cpu, tx->descs_dma);
61 static void ag71xx_rings_free(struct ag71xx *ag)