From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8A46448A44 for ; Fri, 31 Oct 2025 15:39:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 82F5440150; Fri, 31 Oct 2025 15:39:28 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id B102F40150 for ; Fri, 31 Oct 2025 15:39:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761921567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CxEXft9d1ZKHJN94BGM1TzCcW37dg1HzsVU91kjQcBc=; b=IVFXHq9DsEkQQa1f04ciOhS67PBJecgaShaLqj7OzPxNZ4+5UDmT7LtCZ1rzP/j+9MFBD8 Uw5Nf5dpfokxVnwjYOS3OFlqEp35O+DuW1bAHl37zpgTTH9pLc2d27Dp3eqSil2AxwFYN5 TRmVLALm5gk643asdhVWcN+UQ2rJ2ys= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-421-7JmzjOV6Pp2gmMdm1FsyEw-1; Fri, 31 Oct 2025 10:39:24 -0400 X-MC-Unique: 7JmzjOV6Pp2gmMdm1FsyEw-1 X-Mimecast-MFC-AGG-ID: 7JmzjOV6Pp2gmMdm1FsyEw_1761921563 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2214B180899F; Fri, 31 Oct 2025 14:39:23 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.50]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 946EE180057E; Fri, 31 Oct 2025 14:39:21 +0000 (UTC) From: Kevin Traynor To: Hemant Agrawal Cc: Sachin Saxena , dpdk stable Subject: patch 'net/enetfec: fix memory leak in Rx buffer cleanup' has been queued to stable release 24.11.4 Date: Fri, 31 Oct 2025 14:33:49 +0000 Message-ID: <20251031143421.324432-107-ktraynor@redhat.com> In-Reply-To: <20251031143421.324432-1-ktraynor@redhat.com> References: <20251031143421.324432-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: TK6QIuw0mFQjmIYZ-L4NP0wqEe8GWtLheozNpGPLAt8_1761921563 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 24.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/05/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/7c3b93183491c79a9a1adf8d665538c7f5f65df2 Thanks. Kevin --- >From 7c3b93183491c79a9a1adf8d665538c7f5f65df2 Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Mon, 6 Oct 2025 13:34:06 +0530 Subject: [PATCH] net/enetfec: fix memory leak in Rx buffer cleanup [ upstream commit 979d00728b01a77f8f67f46c7cb06e2628542d29 ] The RX buffer cleanup logic did not check for NULL before freeing mbufs, which could lead to undefined behavior. This patch adds a NULL check before freeing each mbuf. Fixes: ecae71571b0d ("net/enetfec: support Rx/Tx") Signed-off-by: Hemant Agrawal Acked-by: Sachin Saxena --- drivers/net/enetfec/enet_ethdev.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/enetfec/enet_ethdev.c b/drivers/net/enetfec/enet_ethdev.c index 77ddc26cbc..bb903539e1 100644 --- a/drivers/net/enetfec/enet_ethdev.c +++ b/drivers/net/enetfec/enet_ethdev.c @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2020-2021,2023 NXP + * Copyright 2020-2021,2023-2024 NXP */ @@ -173,6 +173,8 @@ enet_free_buffers(struct rte_eth_dev *dev) for (i = 0; i < rxq->bd.ring_size; i++) { mbuf = rxq->rx_mbuf[i]; - rxq->rx_mbuf[i] = NULL; - rte_pktmbuf_free(mbuf); + if (mbuf) { + rxq->rx_mbuf[i] = NULL; + rte_pktmbuf_free(mbuf); + } bdp = enet_get_nextdesc(bdp, &rxq->bd); } @@ -560,5 +562,5 @@ err_alloc: } rte_free(rxq); - return errno; + return -ENOMEM; } -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-31 13:53:55.468295243 +0000 +++ 0107-net-enetfec-fix-memory-leak-in-Rx-buffer-cleanup.patch 2025-10-31 13:53:52.285524145 +0000 @@ -1 +1 @@ -From 979d00728b01a77f8f67f46c7cb06e2628542d29 Mon Sep 17 00:00:00 2001 +From 7c3b93183491c79a9a1adf8d665538c7f5f65df2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 979d00728b01a77f8f67f46c7cb06e2628542d29 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index bcecab828e..60bb4f7ebd 100644 +index 77ddc26cbc..bb903539e1 100644 @@ -40 +41 @@ -@@ -548,5 +550,5 @@ err_alloc: +@@ -560,5 +562,5 @@ err_alloc: