patch 'crypto/qat: fix build for generic x86 with GCC 12' has been queued to stable release 22.11.2
Xueming Li
xuemingl at nvidia.com
Mon Feb 27 07:58:47 CET 2023
Hi,
FYI, your patch has been queued to stable release 22.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/01/23. 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=22.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=a636c949963fed2c3e8ce28e48aaab13d95bcb3f
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From a636c949963fed2c3e8ce28e48aaab13d95bcb3f Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Mon, 9 Jan 2023 11:34:36 +0100
Subject: [PATCH] crypto/qat: fix build for generic x86 with GCC 12
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit ad7d6eea316d0d13cc0293f7c5df8dda6696f6b2 ]
Similar to commit 04361fe2aca8 ("crypto/qat: fix build with GCC 12").
The issue appears when building with the "generic" target we have in
devtools/test-meson-builds.sh.
Fixes: 3227bc7138f5 ("crypto/qat: use intel-ipsec-mb for partial hash and AES")
Signed-off-by: David Marchand <david.marchand at redhat.com>
Tested-by: Bruce Richardson <bruce.richardson at intel.com>
---
drivers/crypto/qat/qat_sym_session.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c
index c91acc1e9b..dfff1f4afb 100644
--- a/drivers/crypto/qat/qat_sym_session.c
+++ b/drivers/crypto/qat/qat_sym_session.c
@@ -1331,6 +1331,8 @@ static int qat_sym_do_precomputes_ipsec_mb(enum icp_qat_hw_auth_algo hash_alg,
/* init ipad and opad from key and xor with fixed values */
memset(ipad, 0, block_size);
memset(opad, 0, block_size);
+ RTE_VERIFY(auth_keylen <= sizeof(ipad));
+ RTE_VERIFY(auth_keylen <= sizeof(opad));
rte_memcpy(ipad, auth_key, auth_keylen);
rte_memcpy(opad, auth_key, auth_keylen);
--
2.25.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-02-27 14:08:41.607459600 +0800
+++ 0020-crypto-qat-fix-build-for-generic-x86-with-GCC-12.patch 2023-02-27 14:08:40.729237000 +0800
@@ -1 +1 @@
-From ad7d6eea316d0d13cc0293f7c5df8dda6696f6b2 Mon Sep 17 00:00:00 2001
+From a636c949963fed2c3e8ce28e48aaab13d95bcb3f Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit ad7d6eea316d0d13cc0293f7c5df8dda6696f6b2 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index 978ee49dce..622a3120f8 100644
+index c91acc1e9b..dfff1f4afb 100644
@@ -23 +25 @@
-@@ -1366,6 +1366,8 @@ static int qat_sym_do_precomputes_ipsec_mb(enum icp_qat_hw_auth_algo hash_alg,
+@@ -1331,6 +1331,8 @@ static int qat_sym_do_precomputes_ipsec_mb(enum icp_qat_hw_auth_algo hash_alg,
More information about the stable
mailing list