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 1EFD6489EF for ; Mon, 27 Oct 2025 17:23:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1813E40698; Mon, 27 Oct 2025 17:23:33 +0100 (CET) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mails.dpdk.org (Postfix) with ESMTP id 5565040695 for ; Mon, 27 Oct 2025 17:23:31 +0100 (CET) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-4270491e9easo4018546f8f.2 for ; Mon, 27 Oct 2025 09:23:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761582211; x=1762187011; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=psTHMjeZQMMifDCTHF+XIY8vJAQaKvzSMZpCTKQP/Rg=; b=iHgRlsR3epg7mrr9SqlpRV1XJNYa8VqBLG5ZgzDQFIrwtz7thd+d5Z69nvv1mnrH4t tIOAazBYZRUJBXv5+wyz3UBpW82mXj2+epF+Ut+ZRJfsAONJRmX1LFnI37fopl2gmHFT erUDjNr3o5eavtyMyMy+7c/NXruyvsI7NmnhT3np2q6+47DPMGVOD7RCoC6id4hCzTFE xy1VjADv7/XRcsGBWZ+HrsWTX0tQk7rY7zgTBlG2j4UH4uf1OOaRo80SA7HtLcRQQWuH 92QnYbmVBT1V3KvJaZ0kJJFFTDx1kyi2iHHB1kLZnOmbMmGDYsdDy5MsBNSONYdlsOzO P8ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761582211; x=1762187011; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=psTHMjeZQMMifDCTHF+XIY8vJAQaKvzSMZpCTKQP/Rg=; b=lKMwY53jwiXFJBhR0Co5g/5tnf3gaBuSxyZIi3V39xsddmDGkZmYEk933Bt5wuy/V1 Lt1Rtxe2K/R8JlL0+Zv00/+RGGtR5M9BunPTeyfozaKR10ZinRm248/FIuUPR4U8luvY KD+IkpCkG3HhhJK/39LEROhvouOHJaMnzrXV57g5AFiPdzphKoM6Y+4fj4HBhV9Gqchd dvP/G7X3QffsEf0U0JRurq/2+C1vnjo2+YSj/wMQc3NyI3fI5a9QqGpcGvdlTBErTC8F StMH9mG4KKeDsWcHHHQgKY0SOxHgsB9opY3tCYNogK7ImRJqlcRtu5bTPlsiKluRvOCz b31A== X-Forwarded-Encrypted: i=1; AJvYcCVztZgJEXwa8v1MiOobbqIb1f71vsY+A1IbgE1GRkJ1O3hCmLF3skbvCidGsTANLCdDYvcMe6Y=@dpdk.org X-Gm-Message-State: AOJu0YxyUQJOuPIrR2ShMYQQ/1vHOFc2o8V6ZGMnLbVzahnDsRn2ayo5 xzFNJYgnJNAFanJ9JMFpwhOTum7xYjO16jtilpujxRMfQPz7tZhzS56/8XpBWUxc X-Gm-Gg: ASbGncskSbUwEiWWpLU8WREyCF7s62gYXV0cW3MGwjytOvjgJdXAF6mPIE8piIz2S4t nLCTqgzdWgK49m6uqnbhd3fodJP9u+RLicNNYHNOLAiR9KBER6sJ0o+EkCsF74G1wxsq9fSZoO0 9DNQFw6IhP2jqj9ubxBm+Ep+v+VEeSNdmVcF0d1n6E6sFooN3q+G6fqJ5HKEudEyIPBt2eat0n0 3AlY5otlz51vfHpIOBupWJAzOmcxwVZQIG0z/wVyRNQIYXoY1IoWNF396wWNtGbgTDHm/zG2qkE JicvBwYtmpH6lnWe5A85rKjBZXR+3tIdjzguJPgEZ6Uq3feEzfcqE2mEcI/x2DmJb8LknMXkHJD dSYAsCSq92Bv9NWX5uZ5c8rdPN47Ds0uHnRywJCQ2jpR9AOPQL/hjYCC794xkoGv5Y90P2+PpIA saUZI3CJRrzjtmJvWU X-Google-Smtp-Source: AGHT+IHxpOWvvJ+5YqWVXfCLr3cmjMv/FBZa631mF0OY5LC6muk/0/rXiRp5WYx4HRmbcj4485f5pg== X-Received: by 2002:a05:6000:2383:b0:425:8577:9cd4 with SMTP id ffacd0b85a97d-429a7e86eafmr277045f8f.54.1761582210747; Mon, 27 Oct 2025 09:23:30 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:6fc5:c3bc:147e:832c]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-429952d3532sm15592855f8f.20.2025.10.27.09.23.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Oct 2025 09:23:30 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.11 Date: Mon, 27 Oct 2025 16:19:43 +0000 Message-ID: <20251027162001.3710450-65-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251027162001.3710450-1-luca.boccassi@gmail.com> References: <20251027162001.3710450-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/29/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/496f59b06f375a78775ab71d57adafea0c4abbe9 Thanks. Luca Boccassi --- >From 496f59b06f375a78775ab71d57adafea0c4abbe9 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 e6e74c30b8..c2898737eb 100644 --- a/drivers/net/enetfec/enet_ethdev.c +++ b/drivers/net/enetfec/enet_ethdev.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2020-2021,2023 NXP + * Copyright 2020-2021,2023-2024 NXP */ #include @@ -171,8 +171,10 @@ enet_free_buffers(struct rte_eth_dev *dev) bdp = rxq->bd.base; 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); } } @@ -558,7 +560,7 @@ err_alloc: } } rte_free(rxq); - return errno; + return -ENOMEM; } static const struct eth_dev_ops enetfec_ops = { -- 2.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-27 15:54:37.162841990 +0000 +++ 0065-net-enetfec-fix-memory-leak-in-Rx-buffer-cleanup.patch 2025-10-27 15:54:34.839950653 +0000 @@ -1 +1 @@ -From 979d00728b01a77f8f67f46c7cb06e2628542d29 Mon Sep 17 00:00:00 2001 +From 496f59b06f375a78775ab71d57adafea0c4abbe9 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 e6e74c30b8..c2898737eb 100644 @@ -30 +31 @@ -@@ -172,8 +172,10 @@ enet_free_buffers(struct rte_eth_dev *dev) +@@ -171,8 +171,10 @@ enet_free_buffers(struct rte_eth_dev *dev) @@ -43 +44 @@ -@@ -547,7 +549,7 @@ err_alloc: +@@ -558,7 +560,7 @@ err_alloc: