From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7AB902003AC; Wed, 6 Nov 2024 12:39:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730896788; cv=none; b=ZwSay0VTmInTXSC+RvEtj9hz8y73zWr6LtE0Um6u5SLdwtygOxAO1UdAPpigHflluXr4x5a1xNBX945gPfqL0cBu/16dNFqeTza7+CgmC082f9SYX3QdfOP8o33zE04tha1G++f31/0/7B8beprgnj8YvgHAAXEC8xgbvyHbo+U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730896788; c=relaxed/simple; bh=KiWqeZCj6oTC8/tKLmKEEFgEbLLLy2c+uNmD+UjXOfg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GgubAQQflxcBc4cZcOROI2gnd90+XuF8tuyHrjcpWGEUVYZSEG3w/b9jMLppGzTtpauZV8D3JL5U6+pZQClC7aW3/2qKg5Lfd/hlgq3tJeyoPBnhk+FaR5gZOfz4CaEw8SUg83omPazLlRty2fOtS5463Hk7d4SRGpcnpe/9C/4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Sr2+icHh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Sr2+icHh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8C1DC4CED6; Wed, 6 Nov 2024 12:39:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730896788; bh=KiWqeZCj6oTC8/tKLmKEEFgEbLLLy2c+uNmD+UjXOfg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sr2+icHhOsRaLrAdWzLnhIGwuHPKjcADIvc/a8ij8VNwQLynhaQKzbrZ+oQX6lPSU kTCiYtp2mKZ1pykHi/BimefQl10XTsE3BKbGO5RE4q9zOdj0PD+c3wR26JSsmESW/P i1VuxfYfhYIXaQD4zTGhq247TSb/uCm7W7GXPy14= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wang Hai , Simon Horman , Kalesh AP , Andrew Lunn , Sasha Levin Subject: [PATCH 5.10 036/110] be2net: fix potential memory leak in be_xmit() Date: Wed, 6 Nov 2024 13:04:02 +0100 Message-ID: <20241106120304.192789759@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106120303.135636370@linuxfoundation.org> References: <20241106120303.135636370@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wang Hai [ Upstream commit e4dd8bfe0f6a23acd305f9b892c00899089bd621 ] The be_xmit() returns NETDEV_TX_OK without freeing skb in case of be_xmit_enqueue() fails, add dev_kfree_skb_any() to fix it. Fixes: 760c295e0e8d ("be2net: Support for OS2BMC.") Signed-off-by: Wang Hai Reviewed-by: Simon Horman Reviewed-by: Kalesh AP Message-ID: <20241015144802.12150-1-wanghai38@huawei.com> Signed-off-by: Andrew Lunn Signed-off-by: Sasha Levin --- drivers/net/ethernet/emulex/benet/be_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index edd4dd73b3e32..f018379d13509 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -1382,10 +1382,8 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev) be_get_wrb_params_from_skb(adapter, skb, &wrb_params); wrb_cnt = be_xmit_enqueue(adapter, txo, skb, &wrb_params); - if (unlikely(!wrb_cnt)) { - dev_kfree_skb_any(skb); - goto drop; - } + if (unlikely(!wrb_cnt)) + goto drop_skb; /* if os2bmc is enabled and if the pkt is destined to bmc, * enqueue the pkt a 2nd time with mgmt bit set. @@ -1394,7 +1392,7 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev) BE_WRB_F_SET(wrb_params.features, OS2BMC, 1); wrb_cnt = be_xmit_enqueue(adapter, txo, skb, &wrb_params); if (unlikely(!wrb_cnt)) - goto drop; + goto drop_skb; else skb_get(skb); } @@ -1408,6 +1406,8 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev) be_xmit_flush(adapter, txo); return NETDEV_TX_OK; +drop_skb: + dev_kfree_skb_any(skb); drop: tx_stats(txo)->tx_drv_drops++; /* Flush the already enqueued tx requests */ -- 2.43.0