* [PATCH v2 net] net: ethernet: aeroflex: fix potential memory leak in greth_start_xmit_gbit()
@ 2024-10-12 11:04 Wang Hai
2024-10-12 18:30 ` Gerhard Engleder
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Wang Hai @ 2024-10-12 11:04 UTC (permalink / raw)
To: andreas, gerhard, davem, edumazet, kuba, pabeni, zhangxiaoxu5,
kristoffer
Cc: netdev, linux-kernel, wanghai38
The greth_start_xmit_gbit() returns NETDEV_TX_OK without freeing skb
in case of skb->len being too long, add dev_kfree_skb() to fix it.
Fixes: d4c41139df6e ("net: Add Aeroflex Gaisler 10/100/1G Ethernet MAC driver")
Signed-off-by: Wang Hai <wanghai38@huawei.com>
---
v1->v2: Using dev_kfree_skb() in error handling.
drivers/net/ethernet/aeroflex/greth.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
index 27af7746d645..adf6f67c5fcb 100644
--- a/drivers/net/ethernet/aeroflex/greth.c
+++ b/drivers/net/ethernet/aeroflex/greth.c
@@ -484,7 +484,7 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
if (unlikely(skb->len > MAX_FRAME_SIZE)) {
dev->stats.tx_errors++;
- goto out;
+ goto len_error;
}
/* Save skb pointer. */
@@ -575,6 +575,7 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
map_error:
if (net_ratelimit())
dev_warn(greth->dev, "Could not create TX DMA mapping\n");
+len_error:
dev_kfree_skb(skb);
out:
return err;
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2 net] net: ethernet: aeroflex: fix potential memory leak in greth_start_xmit_gbit()
2024-10-12 11:04 [PATCH v2 net] net: ethernet: aeroflex: fix potential memory leak in greth_start_xmit_gbit() Wang Hai
@ 2024-10-12 18:30 ` Gerhard Engleder
2024-10-15 17:01 ` Jakub Kicinski
2024-10-15 17:10 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 5+ messages in thread
From: Gerhard Engleder @ 2024-10-12 18:30 UTC (permalink / raw)
To: Wang Hai
Cc: netdev, linux-kernel, kristoffer, zhangxiaoxu5, pabeni, kuba,
edumazet, davem, andreas
On 12.10.24 13:04, Wang Hai wrote:
> The greth_start_xmit_gbit() returns NETDEV_TX_OK without freeing skb
> in case of skb->len being too long, add dev_kfree_skb() to fix it.
>
> Fixes: d4c41139df6e ("net: Add Aeroflex Gaisler 10/100/1G Ethernet MAC driver")
> Signed-off-by: Wang Hai <wanghai38@huawei.com>
> ---
> v1->v2: Using dev_kfree_skb() in error handling.
> drivers/net/ethernet/aeroflex/greth.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
> index 27af7746d645..adf6f67c5fcb 100644
> --- a/drivers/net/ethernet/aeroflex/greth.c
> +++ b/drivers/net/ethernet/aeroflex/greth.c
> @@ -484,7 +484,7 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
>
> if (unlikely(skb->len > MAX_FRAME_SIZE)) {
> dev->stats.tx_errors++;
> - goto out;
> + goto len_error;
> }
>
> /* Save skb pointer. */
> @@ -575,6 +575,7 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
> map_error:
> if (net_ratelimit())
> dev_warn(greth->dev, "Could not create TX DMA mapping\n");
> +len_error:
> dev_kfree_skb(skb);
> out:
> return err;
Reviewed-by: Gerhard Engleder <gerhard@engleder-embedded.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2 net] net: ethernet: aeroflex: fix potential memory leak in greth_start_xmit_gbit()
2024-10-12 11:04 [PATCH v2 net] net: ethernet: aeroflex: fix potential memory leak in greth_start_xmit_gbit() Wang Hai
2024-10-12 18:30 ` Gerhard Engleder
@ 2024-10-15 17:01 ` Jakub Kicinski
2024-10-15 17:03 ` Jakub Kicinski
2024-10-15 17:10 ` patchwork-bot+netdevbpf
2 siblings, 1 reply; 5+ messages in thread
From: Jakub Kicinski @ 2024-10-15 17:01 UTC (permalink / raw)
To: Wang Hai
Cc: andreas, gerhard, davem, edumazet, pabeni, zhangxiaoxu5,
kristoffer, netdev, linux-kernel
On Sat, 12 Oct 2024 19:04:34 +0800 Wang Hai wrote:
> The greth_start_xmit_gbit() returns NETDEV_TX_OK without freeing skb
> in case of skb->len being too long, add dev_kfree_skb() to fix it.
>
> Fixes: d4c41139df6e ("net: Add Aeroflex Gaisler 10/100/1G Ethernet MAC driver")
The fixes tag is incorrect. Please pay more careful attention.
Just running git blame on the code you're touching is not enough.
To save everyone time I will fix this when applying.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2 net] net: ethernet: aeroflex: fix potential memory leak in greth_start_xmit_gbit()
2024-10-15 17:01 ` Jakub Kicinski
@ 2024-10-15 17:03 ` Jakub Kicinski
0 siblings, 0 replies; 5+ messages in thread
From: Jakub Kicinski @ 2024-10-15 17:03 UTC (permalink / raw)
To: Wang Hai
Cc: andreas, gerhard, davem, edumazet, pabeni, zhangxiaoxu5,
kristoffer, netdev, linux-kernel
On Tue, 15 Oct 2024 10:01:27 -0700 Jakub Kicinski wrote:
> On Sat, 12 Oct 2024 19:04:34 +0800 Wang Hai wrote:
> > The greth_start_xmit_gbit() returns NETDEV_TX_OK without freeing skb
> > in case of skb->len being too long, add dev_kfree_skb() to fix it.
> >
> > Fixes: d4c41139df6e ("net: Add Aeroflex Gaisler 10/100/1G Ethernet MAC driver")
>
> The fixes tag is incorrect. Please pay more careful attention.
I take that back, sorry. I was looking at
greth_start_xmit vs greth_start_xmit_gbit
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 net] net: ethernet: aeroflex: fix potential memory leak in greth_start_xmit_gbit()
2024-10-12 11:04 [PATCH v2 net] net: ethernet: aeroflex: fix potential memory leak in greth_start_xmit_gbit() Wang Hai
2024-10-12 18:30 ` Gerhard Engleder
2024-10-15 17:01 ` Jakub Kicinski
@ 2024-10-15 17:10 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2024-10-15 17:10 UTC (permalink / raw)
To: Wang Hai
Cc: andreas, gerhard, davem, edumazet, kuba, pabeni, zhangxiaoxu5,
kristoffer, netdev, linux-kernel
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Sat, 12 Oct 2024 19:04:34 +0800 you wrote:
> The greth_start_xmit_gbit() returns NETDEV_TX_OK without freeing skb
> in case of skb->len being too long, add dev_kfree_skb() to fix it.
>
> Fixes: d4c41139df6e ("net: Add Aeroflex Gaisler 10/100/1G Ethernet MAC driver")
> Signed-off-by: Wang Hai <wanghai38@huawei.com>
> ---
> v1->v2: Using dev_kfree_skb() in error handling.
> drivers/net/ethernet/aeroflex/greth.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
Here is the summary with links:
- [v2,net] net: ethernet: aeroflex: fix potential memory leak in greth_start_xmit_gbit()
https://git.kernel.org/netdev/net/c/cf57b5d7a2aa
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-10-15 17:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-12 11:04 [PATCH v2 net] net: ethernet: aeroflex: fix potential memory leak in greth_start_xmit_gbit() Wang Hai
2024-10-12 18:30 ` Gerhard Engleder
2024-10-15 17:01 ` Jakub Kicinski
2024-10-15 17:03 ` Jakub Kicinski
2024-10-15 17:10 ` patchwork-bot+netdevbpf
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).