[dpdk-stable] patch 'crypto/zuc: fix build with GCC 11' has been queued to stable release 20.11.2

Xueming Li xuemingl at nvidia.com
Sat Jun 12 01:04:15 CEST 2021


Hi,

FYI, your patch has been queued to stable release 20.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 06/14/21. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/6156da10414a4f7e60f262ba80dd8b5bf9cccfd3

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 6156da10414a4f7e60f262ba80dd8b5bf9cccfd3 Mon Sep 17 00:00:00 2001
From: Kevin Traynor <ktraynor at redhat.com>
Date: Fri, 14 May 2021 16:08:34 +0100
Subject: [PATCH] crypto/zuc: fix build with GCC 11
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit 099db3d156038b792d97c29a6e2743369d7d50a5 ]

GCC 11 complains that some arrays may be uninitialized in
process_zuc_hash_op(). This is because their initialization
depends on num_ops being > 0.

This function is only called with num_ops > 0 because of
checks in process_zuc_hash_op().

To remove the warning initialize the arrays.

Fixes: 0b133c36ad7d ("crypto/zuc: support IPsec Multi-buffer lib v0.54")

Signed-off-by: Kevin Traynor <ktraynor at redhat.com>
---
 drivers/crypto/zuc/rte_zuc_pmd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/zuc/rte_zuc_pmd.c b/drivers/crypto/zuc/rte_zuc_pmd.c
index a9ff318281..28ce961c77 100644
--- a/drivers/crypto/zuc/rte_zuc_pmd.c
+++ b/drivers/crypto/zuc/rte_zuc_pmd.c
@@ -238,11 +238,11 @@ process_zuc_hash_op(struct zuc_qp *qp, struct rte_crypto_op **ops,
 {
 	unsigned int i;
 	uint8_t processed_ops = 0;
-	uint8_t *src[ZUC_MAX_BURST];
+	uint8_t *src[ZUC_MAX_BURST] = { 0 };
 	uint32_t *dst[ZUC_MAX_BURST];
-	uint32_t length_in_bits[ZUC_MAX_BURST];
-	uint8_t *iv[ZUC_MAX_BURST];
-	const void *hash_keys[ZUC_MAX_BURST];
+	uint32_t length_in_bits[ZUC_MAX_BURST] = { 0 };
+	uint8_t *iv[ZUC_MAX_BURST] = { 0 };
+	const void *hash_keys[ZUC_MAX_BURST] = { 0 };
 	struct zuc_session *sess;
 
 	for (i = 0; i < num_ops; i++) {
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-12 06:54:00.631512700 +0800
+++ 0161-crypto-zuc-fix-build-with-GCC-11.patch	2021-06-12 06:53:56.630000000 +0800
@@ -1 +1 @@
-From 099db3d156038b792d97c29a6e2743369d7d50a5 Mon Sep 17 00:00:00 2001
+From 6156da10414a4f7e60f262ba80dd8b5bf9cccfd3 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit 099db3d156038b792d97c29a6e2743369d7d50a5 ]
@@ -16 +18,0 @@
-Cc: stable at dpdk.org
@@ -24 +26 @@
-index aa50c12da6..42b669f188 100644
+index a9ff318281..28ce961c77 100644


More information about the stable mailing list