* [PATCH v2 net] net: systemport: fix potential memory leak in bcm_sysport_xmit()
@ 2024-10-15 14:35 Wang Hai
2024-10-15 18:03 ` Jakub Kicinski
0 siblings, 1 reply; 2+ messages in thread
From: Wang Hai @ 2024-10-15 14:35 UTC (permalink / raw)
To: florian.fainelli, bcm-kernel-feedback-list, davem, edumazet, kuba,
pabeni, zhangxiaoxu5
Cc: netdev, linux-kernel, wanghai38
The bcm_sysport_xmit() returns NETDEV_TX_OK without freeing skb
in case of dma_map_single() fails, add dev_consume_skb_any() to fix it.
Fixes: 80105befdb4b ("net: systemport: add Broadcom SYSTEMPORT Ethernet MAC driver")
Signed-off-by: Wang Hai <wanghai38@huawei.com>
---
v1->v2: replace dev_kfree_skb_any() with dev_consume_skb_any()
drivers/net/ethernet/broadcom/bcmsysport.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index c9faa8540859..cc0244515304 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -1359,6 +1359,7 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,
netif_err(priv, tx_err, dev, "DMA map failed at %p (len=%d)\n",
skb->data, skb_len);
ret = NETDEV_TX_OK;
+ dev_consume_skb_any(skb);
goto out;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH v2 net] net: systemport: fix potential memory leak in bcm_sysport_xmit()
2024-10-15 14:35 [PATCH v2 net] net: systemport: fix potential memory leak in bcm_sysport_xmit() Wang Hai
@ 2024-10-15 18:03 ` Jakub Kicinski
0 siblings, 0 replies; 2+ messages in thread
From: Jakub Kicinski @ 2024-10-15 18:03 UTC (permalink / raw)
To: Wang Hai
Cc: florian.fainelli, bcm-kernel-feedback-list, davem, edumazet,
pabeni, zhangxiaoxu5, netdev, linux-kernel
On Tue, 15 Oct 2024 22:35:58 +0800 Wang Hai wrote:
> The bcm_sysport_xmit() returns NETDEV_TX_OK without freeing skb
> in case of dma_map_single() fails, add dev_consume_skb_any() to fix it.
Technically you posted it 16min too early (23h 44min) and I'm not sure
this is better than v1, see the discussion there. So I'm discarding
this version.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-10-15 18:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-15 14:35 [PATCH v2 net] net: systemport: fix potential memory leak in bcm_sysport_xmit() Wang Hai
2024-10-15 18:03 ` Jakub Kicinski
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).