patch 'crypto/ipsec_mb: fix queue cleanup null pointer dereference' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/26/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/4b8475c98ed9114c5760a155b111462724314bc5

Thanks.

Kevin

---
>From 4b8475c98ed9114c5760a155b111462724314bc5 Mon Sep 17 00:00:00 2001
From: Ciara Power <ciara.power at intel.com>
Date: Fri, 10 Dec 2021 14:09:51 +0000
Subject: [PATCH] crypto/ipsec_mb: fix queue cleanup null pointer dereference

[ upstream commit 581c39b1cb7d82d301a8ec6a16778bcf6ee11c7c ]

The qp was being used in the cleanup without checking if it was non NULL.
A check is now added to verify qp is non NULL before use.

Coverity issue: 374375
Fixes: c75542ae4200 ("crypto/ipsec_mb: introduce IPsec_mb framework")

Signed-off-by: Ciara Power <ciara.power at intel.com>
Acked-by: Fan Zhang <roy.fan.zhang at intel.com>
---
 drivers/crypto/ipsec_mb/ipsec_mb_ops.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
index 6efa417d67..1ebd23e8f0 100644
--- a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
+++ b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
@@ -286,4 +286,6 @@ ipsec_mb_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
 
 qp_setup_cleanup:
+	if (qp == NULL)
+		return ret;
 #if IMB_VERSION(1, 1, 0) > IMB_VERSION_NUM
 	if (qp->mb_mgr)
@@ -295,6 +297,5 @@ qp_setup_cleanup:
 		rte_memzone_free(qp->mb_mgr_mz);
 #endif
-	if (qp)
-		rte_free(qp);
+	rte_free(qp);
 	return ret;
 }
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-21 15:22:45.157391035 +0000
+++ 0023-crypto-ipsec_mb-fix-queue-cleanup-null-pointer-deref.patch	2022-02-21 15:22:44.044704019 +0000
@@ -1 +1 @@
-From 581c39b1cb7d82d301a8ec6a16778bcf6ee11c7c Mon Sep 17 00:00:00 2001
+From 4b8475c98ed9114c5760a155b111462724314bc5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 581c39b1cb7d82d301a8ec6a16778bcf6ee11c7c ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org