* [PATCH net] net: ethernet: aeroflex: fix potential memory leak in greth_start_xmit_gbit()
@ 2024-10-11 11:39 Wang Hai
2024-10-11 20:41 ` Gerhard Engleder
0 siblings, 1 reply; 3+ messages in thread
From: Wang Hai @ 2024-10-11 11:39 UTC (permalink / raw)
To: andreas, davem, edumazet, kuba, pabeni, kristoffer; +Cc: netdev, linux-kernel
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>
---
drivers/net/ethernet/aeroflex/greth.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
index 27af7746d645..8f6835a710b9 100644
--- a/drivers/net/ethernet/aeroflex/greth.c
+++ b/drivers/net/ethernet/aeroflex/greth.c
@@ -484,6 +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++;
+ dev_kfree_skb(skb);
goto out;
}
--
2.17.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net] net: ethernet: aeroflex: fix potential memory leak in greth_start_xmit_gbit()
2024-10-11 11:39 [PATCH net] net: ethernet: aeroflex: fix potential memory leak in greth_start_xmit_gbit() Wang Hai
@ 2024-10-11 20:41 ` Gerhard Engleder
2024-10-12 11:16 ` Wang Hai
0 siblings, 1 reply; 3+ messages in thread
From: Gerhard Engleder @ 2024-10-11 20:41 UTC (permalink / raw)
To: Wang Hai
Cc: netdev, linux-kernel, andreas, davem, kuba, pabeni, edumazet, kristoffer
On 11.10.24 13:39, 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>
> ---
> drivers/net/ethernet/aeroflex/greth.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
> index 27af7746d645..8f6835a710b9 100644
> --- a/drivers/net/ethernet/aeroflex/greth.c
> +++ b/drivers/net/ethernet/aeroflex/greth.c
> @@ -484,6 +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++;
> + dev_kfree_skb(skb);
> goto out;
dev_kfree_skb(skb) is already part of the error handling, one line above
the "out" label. Why don't you just add another label which includes
dev_kfree_skb(skb) and goto that label?
Gerhard
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net] net: ethernet: aeroflex: fix potential memory leak in greth_start_xmit_gbit()
2024-10-11 20:41 ` Gerhard Engleder
@ 2024-10-12 11:16 ` Wang Hai
0 siblings, 0 replies; 3+ messages in thread
From: Wang Hai @ 2024-10-12 11:16 UTC (permalink / raw)
To: Gerhard Engleder
Cc: netdev, linux-kernel, andreas, davem, kuba, pabeni, edumazet, kristoffer
On 2024/10/12 4:41, Gerhard Engleder wrote:
> On 11.10.24 13:39, 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>
>> ---
>> drivers/net/ethernet/aeroflex/greth.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/net/ethernet/aeroflex/greth.c
>> b/drivers/net/ethernet/aeroflex/greth.c
>> index 27af7746d645..8f6835a710b9 100644
>> --- a/drivers/net/ethernet/aeroflex/greth.c
>> +++ b/drivers/net/ethernet/aeroflex/greth.c
>> @@ -484,6 +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++;
>> + dev_kfree_skb(skb);
>> goto out;
>
> dev_kfree_skb(skb) is already part of the error handling, one line above
> the "out" label. Why don't you just add another label which includes
> dev_kfree_skb(skb) and goto that label?
>
> Gerhard
Hi, Gerhard.
Thanks for the suggestion, I just sent the v2 version.
[PATCH v2 net] net: ethernet: aeroflex: fix potential memory leak in
greth_start_xmit_gbit()
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-12 11:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-10-11 11:39 [PATCH net] net: ethernet: aeroflex: fix potential memory leak in greth_start_xmit_gbit() Wang Hai
2024-10-11 20:41 ` Gerhard Engleder
2024-10-12 11:16 ` Wang Hai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®