diff options
author | Zhipeng Lu <alexious@zju.edu.cn> | 2023-12-14 21:04:04 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-01-08 11:25:03 +0100 |
commit | 1ce20002e91fe286c3752f8ed2e36604a92262ab (patch) | |
tree | a05e112ccfe2387dc51045366be316573ac625bd | |
parent | 817d100d1e7721426807820c68c27948532077c4 (diff) | |
download | linux-stable-1ce20002e91fe286c3752f8ed2e36604a92262ab.tar.gz linux-stable-1ce20002e91fe286c3752f8ed2e36604a92262ab.tar.bz2 linux-stable-1ce20002e91fe286c3752f8ed2e36604a92262ab.zip |
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>
-rw-r--r-- | drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c index 33a688d8aaba..3c6a32d54846 100644 --- 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, |