Re: [PATCH net] net: systemport: fix potential memory leak in bcm_sysport_xmit()

From: Wang Hai
Date: Tue Oct 15 2024 - 10:54:15 EST



On 2024/10/15 0:59, Florian Fainelli wrote:
On 10/14/24 07:51, Wang Hai wrote:
The bcm_sysport_xmit() returns NETDEV_TX_OK without freeing skb
in case of dma_map_single() fails, add dev_kfree_skb() to fix it.

Fixes: 80105befdb4b ("net: systemport: add Broadcom SYSTEMPORT Ethernet MAC driver")
Signed-off-by: Wang Hai <wanghai38@xxxxxxxxxx>
> --->   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..0a68b526e4a8 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_kfree_skb_any(skb);

Since we already have a private counter tracking DMA mapping errors, I would follow what the driver does elsewhere in the transmit path, especially what bcm_sysport_insert_tsb() does, and just use dev_consume_skb_any() here.

Hi, Florian.

Thanks for the suggestion, I've resent the v2 version of this one as well.

[PATCH v2 net] net: systemport: fix potential memory leak in bcm_sysport_xmit()