patch 'crypto/qat: fix crash with CCM null AAD pointer' has been queued to stable release 23.11.1

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.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 04/15/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=72d3dfa9decb8de97c99c5c5ac2cd26413290d7e

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 72d3dfa9decb8de97c99c5c5ac2cd26413290d7e Mon Sep 17 00:00:00 2001
From: Arkadiusz Kusztal <arkadiuszx.kusztal at intel.com>
Date: Fri, 8 Mar 2024 08:25:12 +0000
Subject: [PATCH] crypto/qat: fix crash with CCM null AAD pointer
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit e90ef1803bb34768d1446e756046020e8cbce4bc ]

This commit fixes a segfault, that occurs when NULL pointer
is being set to the AAD pointer field.

Fixes: a815a04cea05 ("crypto/qat: support symmetric build op request")

Signed-off-by: Arkadiusz Kusztal <arkadiuszx.kusztal at intel.com>
Acked-by: Ciara Power <ciara.power at intel.com>
---
 drivers/crypto/qat/dev/qat_crypto_pmd_gens.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h b/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h
index b8ddf42d6f..24044bec13 100644
--- a/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h
+++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h
@@ -894,10 +894,12 @@ enqueue_one_aead_job_gen1(struct qat_sym_session *ctx,
 		*(uint8_t *)&cipher_param->u.cipher_IV_array[0] =
 			q - ICP_QAT_HW_CCM_NONCE_OFFSET;
 
-		rte_memcpy((uint8_t *)aad->va +
-				ICP_QAT_HW_CCM_NONCE_OFFSET,
-			(uint8_t *)iv->va + ICP_QAT_HW_CCM_NONCE_OFFSET,
-			ctx->cipher_iv.length);
+		if (ctx->aad_len > 0) {
+			rte_memcpy((uint8_t *)aad->va +
+					ICP_QAT_HW_CCM_NONCE_OFFSET,
+				(uint8_t *)iv->va + ICP_QAT_HW_CCM_NONCE_OFFSET,
+				ctx->cipher_iv.length);
+		}
 		break;
 	default:
 		break;
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-13 20:43:07.327076989 +0800
+++ 0076-crypto-qat-fix-crash-with-CCM-null-AAD-pointer.patch	2024-04-13 20:43:05.027753892 +0800
@@ -1 +1 @@
-From e90ef1803bb34768d1446e756046020e8cbce4bc Mon Sep 17 00:00:00 2001
+From 72d3dfa9decb8de97c99c5c5ac2cd26413290d7e Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit e90ef1803bb34768d1446e756046020e8cbce4bc ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
-index 60b0f0551c..1f5d2583c4 100644
+index b8ddf42d6f..24044bec13 100644
@@ -22 +24 @@
-@@ -925,10 +925,12 @@ enqueue_one_aead_job_gen1(struct qat_sym_session *ctx,
+@@ -894,10 +894,12 @@ enqueue_one_aead_job_gen1(struct qat_sym_session *ctx,