Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ce20002 authored by Zhipeng Lu's avatar Zhipeng Lu Committed by Greg Kroah-Hartman
Browse files

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: a6a53252 ("atl1e: Atheros L1E Gigabit Ethernet driver")
Signed-off-by: default avatarZhipeng Lu <alexious@zju.edu.cn>
Reviewed-by: default avatarSuman Ghosh <sumang@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 817d100d

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

+4 −1
Original line number Diff line number Diff line
@@ -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,