patch 'net/dpaa2: remove unnecessary check for null before free' has been queued to stable release 22.11.7

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.7

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/22/24. 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/591f0841c67868b7b97aab9369a695153dc55a69

Thanks.

Luca Boccassi

---
>From 591f0841c67868b7b97aab9369a695153dc55a69 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Tue, 12 Nov 2024 09:38:02 -0800
Subject: [PATCH] net/dpaa2: remove unnecessary check for null before free

[ upstream commit e6bf3256b95c77ee4d0b2874e1896d01c41c2d7c ]

Calling rte_free() with NULL parameter is allowed.
Found by nullfree.cocci

Fixes: 5964d36a2904 ("net/dpaa2: release port upon close")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 drivers/net/dpaa2/dpaa2_ethdev.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 8e610b6bba..834f904c14 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -1390,8 +1390,7 @@ dpaa2_dev_close(struct rte_eth_dev *dev)
 	for (i = 0; i < MAX_TCS; i++)
 		rte_free((void *)(size_t)priv->extract.tc_extract_param[i]);
 
-	if (priv->extract.qos_extract_param)
-		rte_free((void *)(size_t)priv->extract.qos_extract_param);
+	rte_free((void *)(size_t)priv->extract.qos_extract_param);
 
 	DPAA2_PMD_INFO("%s: netdev deleted", dev->data->name);
 	return 0;
-- 
2.45.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-11-20 23:41:23.196867601 +0000
+++ 0014-net-dpaa2-remove-unnecessary-check-for-null-before-f.patch	2024-11-20 23:41:22.712195467 +0000
@@ -1 +1 @@
-From e6bf3256b95c77ee4d0b2874e1896d01c41c2d7c Mon Sep 17 00:00:00 2001
+From 591f0841c67868b7b97aab9369a695153dc55a69 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e6bf3256b95c77ee4d0b2874e1896d01c41c2d7c ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -15,4 +16,2 @@
- drivers/net/dpaa2/dpaa2_ethdev.c |  3 +--
- drivers/net/dpaa2/dpaa2_flow.c   | 27 +++++++++------------------
- drivers/net/dpaa2/dpaa2_mux.c    |  6 ++----
- 3 files changed, 12 insertions(+), 24 deletions(-)
+ drivers/net/dpaa2/dpaa2_ethdev.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
@@ -21 +20 @@
-index 8cbe481fb5..a9bce854c3 100644
+index 8e610b6bba..834f904c14 100644
@@ -24 +23 @@
-@@ -1401,8 +1401,7 @@ dpaa2_dev_close(struct rte_eth_dev *dev)
+@@ -1390,8 +1390,7 @@ dpaa2_dev_close(struct rte_eth_dev *dev)
@@ -26 +25 @@
- 		rte_free(priv->extract.tc_extract_param[i]);
+ 		rte_free((void *)(size_t)priv->extract.tc_extract_param[i]);
@@ -29,2 +28,2 @@
--		rte_free(priv->extract.qos_extract_param);
-+	rte_free(priv->extract.qos_extract_param);
+-		rte_free((void *)(size_t)priv->extract.qos_extract_param);
++	rte_free((void *)(size_t)priv->extract.qos_extract_param);
@@ -34,69 +32,0 @@
-diff --git a/drivers/net/dpaa2/dpaa2_flow.c b/drivers/net/dpaa2/dpaa2_flow.c
-index de850ae0cf..c94eb51ba5 100644
---- a/drivers/net/dpaa2/dpaa2_flow.c
-+++ b/drivers/net/dpaa2/dpaa2_flow.c
-@@ -4784,8 +4784,7 @@ end_flow_set:
- 		}
- 	}
- 
--	if (dpaa2_pattern)
--		rte_free(dpaa2_pattern);
-+	rte_free(dpaa2_pattern);
- 
- 	return ret;
- }
-@@ -5057,14 +5056,10 @@ mem_failure:
- 
- creation_error:
- 	if (flow) {
--		if (flow->qos_key_addr)
--			rte_free(flow->qos_key_addr);
--		if (flow->qos_mask_addr)
--			rte_free(flow->qos_mask_addr);
--		if (flow->fs_key_addr)
--			rte_free(flow->fs_key_addr);
--		if (flow->fs_mask_addr)
--			rte_free(flow->fs_mask_addr);
-+		rte_free(flow->qos_key_addr);
-+		rte_free(flow->qos_mask_addr);
-+		rte_free(flow->fs_key_addr);
-+		rte_free(flow->fs_mask_addr);
- 		rte_free(flow);
- 	}
- 	priv->curr = NULL;
-@@ -5128,14 +5123,10 @@ dpaa2_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *_flow,
- 	}
- 
- 	LIST_REMOVE(flow, next);
--	if (flow->qos_key_addr)
--		rte_free(flow->qos_key_addr);
--	if (flow->qos_mask_addr)
--		rte_free(flow->qos_mask_addr);
--	if (flow->fs_key_addr)
--		rte_free(flow->fs_key_addr);
--	if (flow->fs_mask_addr)
--		rte_free(flow->fs_mask_addr);
-+	rte_free(flow->qos_key_addr);
-+	rte_free(flow->qos_mask_addr);
-+	rte_free(flow->fs_key_addr);
-+	rte_free(flow->fs_mask_addr);
- 	/* Now free the flow */
- 	rte_free(flow);
- 
-diff --git a/drivers/net/dpaa2/dpaa2_mux.c b/drivers/net/dpaa2/dpaa2_mux.c
-index e9d48a81a8..2f124313fa 100644
---- a/drivers/net/dpaa2/dpaa2_mux.c
-+++ b/drivers/net/dpaa2/dpaa2_mux.c
-@@ -329,10 +329,8 @@ rte_pmd_dpaa2_mux_flow_create(uint32_t dpdmux_id,
- 	}
- 
- creation_error:
--	if (key_cfg_va)
--		rte_free(key_cfg_va);
--	if (key_va)
--		rte_free(key_va);
-+	rte_free(key_cfg_va);
-+	rte_free(key_va);
- 
- 	return ret;
- }