patch 'net/enetfec: fix memory leak in Rx buffer cleanup' has been queued to stable release 22.11.11

[luca.boccassi at gmail.com]

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 <hemant.agrawal at nxp.com>
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 <hemant.agrawal at nxp.com>
Acked-by: Sachin Saxena <sachin.saxena at nxp.com>
---
 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 <inttypes.h>
@@ -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 at 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: