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 0DB73189BAF; Mon, 28 Oct 2024 06:39:42 +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=1730097582; cv=none; b=VdUDt+nJcYzxVEv4wz8acUPfdSbgSnhN6KTZFzP61DKG+G+2GrxybcDq2YGM8wOCL/jHUAB8j4+ZX8LfR2PS4zgHdvX5ZFtmN0VJTJDyuWYH4MmFpbA/Ka0PfaNfRFjjjSTKp50uftI4UVOt5aUg6e77MD9EOZuDmklY7Vyo7o0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730097582; c=relaxed/simple; bh=+qf4CuLS4Od66zOb2S/3jxbV3hVrQeHwiVA0R5qcEeM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Aqqa3zygm/E9A1OBmRGmahsSpr6d1BOEGso7hODEISfaUY+EmGZTmZh29qd6/AtSNmWQih3nTU/GFv6LVqCuwTmsvEZ8Uw/mCoCyOzVI+sofpi0yKsx++fJaU2pWTMwk0HPcv/FldADlA1UoPPCNAlR4YJKP31ZvasgGaCMAhtA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MsnqNmbZ; 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="MsnqNmbZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A12F2C4CEC3; Mon, 28 Oct 2024 06:39:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730097581; bh=+qf4CuLS4Od66zOb2S/3jxbV3hVrQeHwiVA0R5qcEeM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MsnqNmbZlW6KhbOcBay8RpqRK8ZNWT4o1M/SmBLfGV41vAnwfV8iFRYrIzKskYqlM QQLGjc1IDtVY13n+76fTiE4Ih/Vy2FJ/JHYR+VBTLiWGicDIoFmdvUS2KarraxFDCv n+1hHBqpj0nzqlUcls4LoJJj3d9XZ6tASPThZT2w= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wang Hai , Gerhard Engleder , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 055/208] net: ethernet: aeroflex: fix potential memory leak in greth_start_xmit_gbit() Date: Mon, 28 Oct 2024 07:23:55 +0100 Message-ID: <20241028062308.011455990@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241028062306.649733554@linuxfoundation.org> References: <20241028062306.649733554@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 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wang Hai [ Upstream commit cf57b5d7a2aad456719152ecd12007fe031628a3 ] The greth_start_xmit_gbit() returns NETDEV_TX_OK without freeing skb in case of skb->len being too long, add dev_kfree_skb() to fix it. Fixes: d4c41139df6e ("net: Add Aeroflex Gaisler 10/100/1G Ethernet MAC driver") Signed-off-by: Wang Hai Reviewed-by: Gerhard Engleder Link: https://patch.msgid.link/20241012110434.49265-1-wanghai38@huawei.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/aeroflex/greth.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c index 597a02c75d527..e624d31d20d89 100644 --- a/drivers/net/ethernet/aeroflex/greth.c +++ b/drivers/net/ethernet/aeroflex/greth.c @@ -484,7 +484,7 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev) if (unlikely(skb->len > MAX_FRAME_SIZE)) { dev->stats.tx_errors++; - goto out; + goto len_error; } /* Save skb pointer. */ @@ -575,6 +575,7 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev) map_error: if (net_ratelimit()) dev_warn(greth->dev, "Could not create TX DMA mapping\n"); +len_error: dev_kfree_skb(skb); out: return err; -- 2.43.0