Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <ea5c55f30cab0a7c8d17f92e2eca2ff5a60f52c3.camel@gmail.com>
Subject: Re: [PATCH net] fm10k: fix potential memleak in fm10k_xmit_frame()
From:   Alexander H Duyck <alexander.duyck@gmail.com>
To:     Zhang Changzhong <zhangchangzhong@huawei.com>,
        Jesse Brandeburg <jesse.brandeburg@intel.com>,
        Tony Nguyen <anthony.l.nguyen@intel.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
        Alexander Duyck <alexander.h.duyck@intel.com>
Cc:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Date:   Fri, 18 Nov 2022 07:36:03 -0800
In-Reply-To: <1668775048-22031-1-git-send-email-zhangchangzhong@huawei.com>
References: <1668775048-22031-1-git-send-email-zhangchangzhong@huawei.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.44.4 (3.44.4-2.fc36) 
MIME-Version: 1.0
Precedence: bulk

On Fri, 2022-11-18 at 20:37 +0800, Zhang Changzhong wrote:
> The fm10k_xmit_frame() returns NETDEV_TX_OK without freeing skb in error
> handling case, add dev_kfree_skb() to fix it. Compile tested only.
>=20
> Fixes: b101c9626477 ("fm10k: Add transmit and receive fastpath and interr=
upt handlers")
> Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
> ---
>  drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>=20
> diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/ne=
t/ethernet/intel/fm10k/fm10k_netdev.c
> index 2cca9e8..c7b672a 100644
> --- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
> +++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
> @@ -531,8 +531,10 @@ static netdev_tx_t fm10k_xmit_frame(struct sk_buff *=
skb, struct net_device *dev)
>  			return NETDEV_TX_OK;
> =20
>  		/* make sure there is enough room to move the ethernet header */
> -		if (unlikely(!pskb_may_pull(skb, VLAN_ETH_HLEN)))
> +		if (unlikely(!pskb_may_pull(skb, VLAN_ETH_HLEN))) {
> +			dev_kfree_skb(skb);
>  			return NETDEV_TX_OK;
> +		}
> =20
>  		/* verify the skb head is not shared */
>  		err =3D skb_cow_head(skb, 0);

Fix looks good to me.

Reviewed-by: Alexander Duyck <alexanderduyck@fb.com>