[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <609764d0-21e9-49d0-acb1-e2f2666bef0d@huawei.com>
Date: Tue, 15 Oct 2024 22:54:00 +0800
From: Wang Hai <wanghai38@...wei.com>
To: Florian Fainelli <florian.fainelli@...adcom.com>,
<bcm-kernel-feedback-list@...adcom.com>, <davem@...emloft.net>,
<edumazet@...gle.com>, <kuba@...nel.org>, <pabeni@...hat.com>,
<zhangxiaoxu5@...wei.com>
CC: <netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH net] net: systemport: fix potential memory leak in
bcm_sysport_xmit()
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@...wei.com>
> > ---> 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()
Powered by blists - more mailing lists