From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2CE9C433FE for ; Thu, 17 Nov 2022 12:45:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234674AbiKQMp3 (ORCPT ); Thu, 17 Nov 2022 07:45:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234017AbiKQMpA (ORCPT ); Thu, 17 Nov 2022 07:45:00 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 853CB7342D; Thu, 17 Nov 2022 04:42:19 -0800 (PST) Received: from dggpeml500023.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NCfb046YpzqSP2; Thu, 17 Nov 2022 20:38:04 +0800 (CST) Received: from dggpeml500006.china.huawei.com (7.185.36.76) by dggpeml500023.china.huawei.com (7.185.36.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 17 Nov 2022 20:41:53 +0800 Received: from [10.174.178.240] (10.174.178.240) by dggpeml500006.china.huawei.com (7.185.36.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 17 Nov 2022 20:41:53 +0800 Subject: Re: [PATCH net] sfc: fix potential memleak in __ef100_hard_start_xmit() To: Leon Romanovsky CC: Edward Cree , Martin Habets , "David S. Miller" , "Eric Dumazet" , Jakub Kicinski , Paolo Abeni , , References: <1668671409-10909-1-git-send-email-zhangchangzhong@huawei.com> From: Zhang Changzhong Message-ID: Date: Thu, 17 Nov 2022 20:41:52 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.178.240] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpeml500006.china.huawei.com (7.185.36.76) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2022/11/17 19:36, Leon Romanovsky wrote: > On Thu, Nov 17, 2022 at 03:50:09PM +0800, Zhang Changzhong wrote: >> The __ef100_hard_start_xmit() returns NETDEV_TX_OK without freeing skb >> in error handling case, add dev_kfree_skb_any() to fix it. >> >> Fixes: 51b35a454efd ("sfc: skeleton EF100 PF driver") >> Signed-off-by: Zhang Changzhong >> --- >> drivers/net/ethernet/sfc/ef100_netdev.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/drivers/net/ethernet/sfc/ef100_netdev.c b/drivers/net/ethernet/sfc/ef100_netdev.c >> index 88fa295..ddcc325 100644 >> --- a/drivers/net/ethernet/sfc/ef100_netdev.c >> +++ b/drivers/net/ethernet/sfc/ef100_netdev.c >> @@ -218,6 +218,7 @@ netdev_tx_t __ef100_hard_start_xmit(struct sk_buff *skb, >> skb->len, skb->data_len, channel->channel); >> if (!efx->n_channels || !efx->n_tx_channels || !channel) { >> netif_stop_queue(net_dev); >> + dev_kfree_skb_any(skb); >> goto err; >> } > > ef100 doesn't release in __ef100_enqueue_skb() either. SKB shouldn't be > NULL or ERR at this stage. SKB shouldn't be NULL or ERR, so it can be freed. But this code looks weird. > > diff --git a/drivers/net/ethernet/sfc/ef100_tx.c b/drivers/net/ethernet/sfc/ef100_tx.c > index 29ffaf35559d..426706b91d02 100644 > --- a/drivers/net/ethernet/sfc/ef100_tx.c > +++ b/drivers/net/ethernet/sfc/ef100_tx.c > @@ -497,7 +497,7 @@ int __ef100_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb, > > err: > efx_enqueue_unwind(tx_queue, old_insert_count); > - if (!IS_ERR_OR_NULL(skb)) > + if (rc) > dev_kfree_skb_any(skb); > > /* If we're not expecting another transmit and we had something to push > > >> >> -- >> 2.9.5 >> > . >