Skip to content

Commit ed4cb8a

Browse files
AlexiousLugregkh
authored andcommitted
ethernet: atheros: fix a memleak in atl1e_setup_ring_resources
[ Upstream commit 309fdb1 ] 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: a6a5325 ("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>
1 parent 3f82a6a commit ed4cb8a

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/net/ethernet/atheros/atl1e/atl1e_main.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,10 +868,13 @@ static int atl1e_setup_ring_resources(struct atl1e_adapter *adapter)
868868
netdev_err(adapter->netdev, "offset(%d) > ring size(%d) !!\n",
869869
offset, adapter->ring_size);
870870
err = -1;
871-
goto failed;
871+
goto free_buffer;
872872
}
873873

874874
return 0;
875+
free_buffer:
876+
kfree(tx_ring->tx_buffer);
877+
tx_ring->tx_buffer = NULL;
875878
failed:
876879
if (adapter->ring_vir_addr != NULL) {
877880
pci_free_consistent(pdev, adapter->ring_size,

0 commit comments

Comments
 (0)