ethernet: atheros: fix a memleak in atl1e_setup_ring_resources
authorZhipeng Lu <alexious@zju.edu.cn>
Thu, 14 Dec 2023 13:04:04 +0000 (21:04 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Jan 2024 12:42:31 +0000 (12:42 +0000)
[ Upstream commit 309fdb1c33fe726d92d0030481346f24e1b01f07 ]

In the error handling of 'offset > adapter->ring_size', the
tx_ring->tx_buffer allocated by kzalloc should be freed,
instead of 'goto failed' instantly.

Fixes: a6a5325239c2 ("atl1e: Atheros L1E Gigabit Ethernet driver")
Signed-off-by: Zhipeng Lu <alexious@zju.edu.cn>
Reviewed-by: Suman Ghosh <sumang@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/atheros/atl1e/atl1e_main.c

index 5935be1..5f2a6fc 100644 (file)
@@ -866,10 +866,13 @@ static int atl1e_setup_ring_resources(struct atl1e_adapter *adapter)
                netdev_err(adapter->netdev, "offset(%d) > ring size(%d) !!\n",
                           offset, adapter->ring_size);
                err = -1;
-               goto failed;
+               goto free_buffer;
        }
 
        return 0;
+free_buffer:
+       kfree(tx_ring->tx_buffer);
+       tx_ring->tx_buffer = NULL;
 failed:
        if (adapter->ring_vir_addr != NULL) {
                dma_free_coherent(&pdev->dev, adapter->ring_size,