ethernet: atheros: fix a memleak in atl1e_setup_ring_resources

[ 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>

diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
index 33a688d8aaba926e79b9fca35838a8fc279b1a4d..3c6a32d5484686ed79cedad68d18448201886677 100644 (file)
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
@@ -880,10 +880,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) {
                pci_free_consistent(pdev, adapter->ring_size,