* [PATCH] [v2] ethernet: atheros: fix a memleak in atl1e_setup_ring_resources
@ 2023-12-08 8:23 Zhipeng Lu
2023-12-08 8:51 ` [EXT] " Suman Ghosh
2023-12-12 3:14 ` Jakub Kicinski
0 siblings, 2 replies; 4+ messages in thread
From: Zhipeng Lu @ 2023-12-08 8:23 UTC (permalink / raw)
To: alexious
Cc: Chris Snook, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Simon Horman, Yuanjun Gong, Jie Yang, Jeff Garzik,
netdev, linux-kernel
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>
---
Changelog:
v2: Setting tx_ring->tx_buffer to NULL after free.
---
drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
index 5935be190b9e..1bffe77439ac 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
@@ -866,6 +866,8 @@ 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;
+ kfree(tx_ring->tx_buffer);
+ tx_ring->tx_buffer = NULL;
goto failed;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* RE: [EXT] [PATCH] [v2] ethernet: atheros: fix a memleak in atl1e_setup_ring_resources
2023-12-08 8:23 [PATCH] [v2] ethernet: atheros: fix a memleak in atl1e_setup_ring_resources Zhipeng Lu
@ 2023-12-08 8:51 ` Suman Ghosh
2023-12-12 3:14 ` Jakub Kicinski
1 sibling, 0 replies; 4+ messages in thread
From: Suman Ghosh @ 2023-12-08 8:51 UTC (permalink / raw)
To: Zhipeng Lu
Cc: Chris Snook, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Simon Horman, Yuanjun Gong, Jie Yang, Jeff Garzik,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
>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>
>
>Changelog:
>
>v2: Setting tx_ring->tx_buffer to NULL after free.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] [v2] ethernet: atheros: fix a memleak in atl1e_setup_ring_resources
2023-12-08 8:23 [PATCH] [v2] ethernet: atheros: fix a memleak in atl1e_setup_ring_resources Zhipeng Lu
2023-12-08 8:51 ` [EXT] " Suman Ghosh
@ 2023-12-12 3:14 ` Jakub Kicinski
2023-12-14 13:05 ` alexious
1 sibling, 1 reply; 4+ messages in thread
From: Jakub Kicinski @ 2023-12-12 3:14 UTC (permalink / raw)
To: Zhipeng Lu
Cc: Chris Snook, David S. Miller, Eric Dumazet, Paolo Abeni,
Simon Horman, Yuanjun Gong, Jie Yang, Jeff Garzik, netdev,
linux-kernel
On Fri, 8 Dec 2023 16:23:14 +0800 Zhipeng Lu wrote:
> v2: Setting tx_ring->tx_buffer to NULL after free.
Having closer look at this driver - it tries to free both on close and
remove, so seems like we do indeed have to NULL-out the pointer, sigh.
> diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
> index 5935be190b9e..1bffe77439ac 100644
> --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
> +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
> @@ -866,6 +866,8 @@ 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;
> + kfree(tx_ring->tx_buffer);
> + tx_ring->tx_buffer = NULL;
> goto failed;
Please add a new jump target, tho, and move the freeing there.
There's a small chance someone will add more code to this function
and it will need to copy / paste this unwind.
--
pw-bot: cr
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Re: [PATCH] [v2] ethernet: atheros: fix a memleak in atl1e_setup_ring_resources
2023-12-12 3:14 ` Jakub Kicinski
@ 2023-12-14 13:05 ` alexious
0 siblings, 0 replies; 4+ messages in thread
From: alexious @ 2023-12-14 13:05 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Chris Snook, David S. Miller, Eric Dumazet, Paolo Abeni,
Simon Horman, Yuanjun Gong, Jie Yang, Jeff Garzik, netdev,
linux-kernel
> On Fri, 8 Dec 2023 16:23:14 +0800 Zhipeng Lu wrote:
> > v2: Setting tx_ring->tx_buffer to NULL after free.
>
> Having closer look at this driver - it tries to free both on close and
> remove, so seems like we do indeed have to NULL-out the pointer, sigh.
>
> > diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
> > index 5935be190b9e..1bffe77439ac 100644
> > --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
> > +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
> > @@ -866,6 +866,8 @@ 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;
> > + kfree(tx_ring->tx_buffer);
> > + tx_ring->tx_buffer = NULL;
> > goto failed;
>
> Please add a new jump target, tho, and move the freeing there.
> There's a small chance someone will add more code to this function
> and it will need to copy / paste this unwind.
> --
Thank you for your advice, I've send a v3 version of this patch.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-12-14 13:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-08 8:23 [PATCH] [v2] ethernet: atheros: fix a memleak in atl1e_setup_ring_resources Zhipeng Lu
2023-12-08 8:51 ` [EXT] " Suman Ghosh
2023-12-12 3:14 ` Jakub Kicinski
2023-12-14 13:05 ` alexious
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).