From: Wang Hai <wanghai38@huawei.com>
To: Florian Fainelli <florian.fainelli@broadcom.com>,
<bcm-kernel-feedback-list@broadcom.com>, <davem@davemloft.net>,
<edumazet@google.com>, <kuba@kernel.org>, <pabeni@redhat.com>,
<zhangxiaoxu5@huawei.com>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH net] net: systemport: fix potential memory leak in bcm_sysport_xmit()
Date: Tue, 15 Oct 2024 22:54:00 +0800 [thread overview]
Message-ID: <609764d0-21e9-49d0-acb1-e2f2666bef0d@huawei.com> (raw)
In-Reply-To: <0c21ac6a-fda4-4924-9ad1-db1b549be418@broadcom.com>
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@huawei.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()
next prev parent reply other threads:[~2024-10-15 14:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-14 14:51 Wang Hai
2024-10-14 16:59 ` Florian Fainelli
2024-10-15 14:54 ` Wang Hai [this message]
2024-10-15 18:01 ` Jakub Kicinski
2024-10-15 18:07 ` Florian Fainelli
2024-10-15 19:54 ` Jakub Kicinski
2024-10-15 23:55 ` Florian Fainelli
2024-10-16 0:00 ` Jakub Kicinski
2024-10-15 23:53 ` Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=609764d0-21e9-49d0-acb1-e2f2666bef0d@huawei.com \
--to=wanghai38@huawei.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=florian.fainelli@broadcom.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=zhangxiaoxu5@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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®