From: Wang Hai <wanghai38@huawei.com>
To: Florian Fainelli <florian.fainelli@broadcom.com>,
<justin.chen@broadcom.com>, <davem@davemloft.net>,
<edumazet@google.com>, <kuba@kernel.org>, <pabeni@redhat.com>,
<horms@kernel.org>, <zhangxiaoxu5@huawei.com>
Cc: <bcm-kernel-feedback-list@broadcom.com>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH net] net: bcmasp: fix potential memory leak in bcmasp_xmit()
Date: Tue, 15 Oct 2024 22:52:08 +0800 [thread overview]
Message-ID: <f275b30a-4892-4867-936f-c8de41c05b9e@huawei.com> (raw)
In-Reply-To: <924f6a1b-17af-4dc8-80e3-7c7df687131a@broadcom.com>
On 2024/10/15 1:14, Florian Fainelli wrote:
> On 10/14/24 07:59, Wang Hai wrote:
>> The bcmasp_xmit() returns NETDEV_TX_OK without freeing skb
>> in case of mapping fails, add dev_kfree_skb() to fix it.
>>
>> Fixes: 490cb412007d ("net: bcmasp: Add support for ASP2.0 Ethernet
>> controller")
>> Signed-off-by: Wang Hai <wanghai38@huawei.com>
>> ---
>> drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
>> b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
>> index 82768b0e9026..9ea16ef4139d 100644
>> --- a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
>> +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
>> @@ -322,6 +322,7 @@ static netdev_tx_t bcmasp_xmit(struct sk_buff
>> *skb, struct net_device *dev)
>> }
>> /* Rewind so we do not have a hole */
>> spb_index = intf->tx_spb_index;
>> + dev_kfree_skb(skb);
>
> Similar reasoning to the change proposed to bcmsysport.c, we already
> have a private counter tracking DMA mapping errors, therefore I would
> consider using dev_consume_skb_any() here.
Hi, Florian.
Thanks for the suggestion, I've resent v2.
[PATCH v2 net] net: bcmasp: fix potential memory leak in bcmasp_xmit()
next prev parent reply other threads:[~2024-10-15 14:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-14 14:59 [PATCH net] net: bcmasp: fix potential memory leak in bcmasp_xmit() Wang Hai
2024-10-14 17:14 ` Florian Fainelli
2024-10-15 14:52 ` Wang Hai [this message]
2024-10-16 0:01 ` Jakub Kicinski
2024-10-16 0:02 ` Florian Fainelli
2024-10-16 0:50 ` patchwork-bot+netdevbpf
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=f275b30a-4892-4867-936f-c8de41c05b9e@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=horms@kernel.org \
--cc=justin.chen@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