patch 'net/ice: fix null function pointer call' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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/14/22. 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/82c8b37f5a27b9750e2ede555640dbad879f63b7

Thanks.

Kevin

---
>From 82c8b37f5a27b9750e2ede555640dbad879f63b7 Mon Sep 17 00:00:00 2001
From: Tomasz Jonak <tomasz at graphiant.com>
Date: Wed, 12 Oct 2022 14:27:57 +0200
Subject: [PATCH] net/ice: fix null function pointer call

[ upstream commit a8880adcd5f4ea92d0221ff41902d516e68e89ab ]

In case rte_eth_dma_zone_reserve fails in ice_tx_queue_setup
ice_tx_queue_release is called on 0 allocated but not initialized
txq struct.
This may happen on ENOMEM condition, size exhaustion of
memconfig->memzones array as well as some others.

Fixes: edec6dd83824 ("net/ice: remove redundant functions")

Signed-off-by: Tomasz Jonak <tomasz at graphiant.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_rxtx.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index e64fb00792..f7455c7726 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -1198,5 +1198,6 @@ ice_rx_queue_release(void *rxq)
 	}
 
-	q->rx_rel_mbufs(q);
+	if (q->rx_rel_mbufs != NULL)
+		q->rx_rel_mbufs(q);
 	rte_free(q->sw_ring);
 	rte_memzone_free(q->mz);
@@ -1408,5 +1409,6 @@ ice_tx_queue_release(void *txq)
 	}
 
-	q->tx_rel_mbufs(q);
+	if (q->tx_rel_mbufs != NULL)
+		q->tx_rel_mbufs(q);
 	rte_free(q->sw_ring);
 	rte_memzone_free(q->mz);
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-11 10:32:17.684891477 +0000
+++ 0025-net-ice-fix-null-function-pointer-call.patch	2022-11-11 10:32:17.079300789 +0000
@@ -1 +1 @@
-From a8880adcd5f4ea92d0221ff41902d516e68e89ab Mon Sep 17 00:00:00 2001
+From 82c8b37f5a27b9750e2ede555640dbad879f63b7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a8880adcd5f4ea92d0221ff41902d516e68e89ab ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index 697251c603..953ff217df 100644
+index e64fb00792..f7455c7726 100644
@@ -25 +26 @@
-@@ -1303,5 +1303,6 @@ ice_rx_queue_release(void *rxq)
+@@ -1198,5 +1198,6 @@ ice_rx_queue_release(void *rxq)
@@ -33 +34 @@
-@@ -1513,5 +1514,6 @@ ice_tx_queue_release(void *txq)
+@@ -1408,5 +1409,6 @@ ice_tx_queue_release(void *txq)