patch 'crypto/ipsec_mb: check missing operation types' has been queued to stable release 21.11.1

Kevin Traynor ktraynor at redhat.com
Tue Mar 1 11:41:48 CET 2022


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 03/06/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/bbc596578afe0eba3cfb29792eae278800c4e661

Thanks.

Kevin

---
>From bbc596578afe0eba3cfb29792eae278800c4e661 Mon Sep 17 00:00:00 2001
From: Pablo de Lara <pablo.de.lara.guarch at intel.com>
Date: Wed, 23 Feb 2022 16:01:13 +0000
Subject: [PATCH] crypto/ipsec_mb: check missing operation types

[ upstream commit cfb566048ee729969d982a0c6020148d69f585fc ]

When processing crypto operations in ZUC PMD,
there were two operation types that were set at session level,
but not checked when the operations are enqueued and processed,
leaving the buffers untouched silently.

Fixes: cde8df1bda9d ("crypto/ipsec_mb: move zuc PMD")

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
---
 drivers/crypto/ipsec_mb/pmd_zuc.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/ipsec_mb/pmd_zuc.c b/drivers/crypto/ipsec_mb/pmd_zuc.c
index 2eae1d1ec7..ec83d96dfc 100644
--- a/drivers/crypto/ipsec_mb/pmd_zuc.c
+++ b/drivers/crypto/ipsec_mb/pmd_zuc.c
@@ -199,5 +199,5 @@ process_ops(struct rte_crypto_op **ops, enum ipsec_mb_operation op_type,
 {
 	unsigned int i;
-	unsigned int processed_ops;
+	unsigned int processed_ops = 0;
 
 	switch (op_type) {
@@ -213,4 +213,5 @@ process_ops(struct rte_crypto_op **ops, enum ipsec_mb_operation op_type,
 		break;
 	case IPSEC_MB_OP_ENCRYPT_THEN_HASH_GEN:
+	case IPSEC_MB_OP_DECRYPT_THEN_HASH_VERIFY:
 		processed_ops = process_zuc_cipher_op(qp, ops, sessions,
 				num_ops);
@@ -218,4 +219,5 @@ process_ops(struct rte_crypto_op **ops, enum ipsec_mb_operation op_type,
 		break;
 	case IPSEC_MB_OP_HASH_VERIFY_THEN_DECRYPT:
+	case IPSEC_MB_OP_HASH_GEN_THEN_ENCRYPT:
 		processed_ops = process_zuc_hash_op(qp, ops, sessions,
 				num_ops);
@@ -224,5 +226,6 @@ process_ops(struct rte_crypto_op **ops, enum ipsec_mb_operation op_type,
 	default:
 		/* Operation not supported. */
-		processed_ops = 0;
+		for (i = 0; i < num_ops; i++)
+			ops[i]->status = RTE_CRYPTO_OP_STATUS_INVALID_SESSION;
 	}
 
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-01 10:41:02.213507766 +0000
+++ 0032-crypto-ipsec_mb-check-missing-operation-types.patch	2022-03-01 10:41:01.285244094 +0000
@@ -1 +1 @@
-From cfb566048ee729969d982a0c6020148d69f585fc Mon Sep 17 00:00:00 2001
+From bbc596578afe0eba3cfb29792eae278800c4e661 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cfb566048ee729969d982a0c6020148d69f585fc ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org



More information about the stable mailing list