patch 'crypto/qat: fix stream cipher direction' has been queued to stable release 20.11.8

luca.boccassi at gmail.com luca.boccassi at gmail.com
Thu Feb 23 10:36:11 CET 2023


Hi,

FYI, your patch has been queued to stable release 20.11.8

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/25/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://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/09162b9e22428a67be570cab8b4231b5810ef246

Thanks.

Luca Boccassi

---
>From 09162b9e22428a67be570cab8b4231b5810ef246 Mon Sep 17 00:00:00 2001
From: Ciara Power <ciara.power at intel.com>
Date: Wed, 21 Dec 2022 14:05:55 +0000
Subject: [PATCH] crypto/qat: fix stream cipher direction

[ upstream commit 96ef7feb7a63ee74a99e221d255d91e8af3cf196 ]

Stream ciphers use ENCRYPT mode in HW for both encryption and
decryption operations. This patch adds in an overwrite to always set
ENCRYPT mode for these algorithms.

Fixes: d9b7d5bbc845 ("crypto/qat: add ZUC EEA3/EIA3 capability")

Signed-off-by: Ciara Power <ciara.power at intel.com>
---
 drivers/crypto/qat/qat_sym_session.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c
index 10db656316..d397bde1ca 100644
--- a/drivers/crypto/qat/qat_sym_session.c
+++ b/drivers/crypto/qat/qat_sym_session.c
@@ -1572,9 +1572,10 @@ int qat_sym_session_aead_create_cd_cipher(struct qat_sym_session *cdesc,
 		key_convert = ICP_QAT_HW_CIPHER_NO_CONVERT;
 	} else if (cdesc->qat_cipher_alg == ICP_QAT_HW_CIPHER_ALGO_SNOW_3G_UEA2
 		|| cdesc->qat_cipher_alg ==
-			ICP_QAT_HW_CIPHER_ALGO_ZUC_3G_128_EEA3)
+			ICP_QAT_HW_CIPHER_ALGO_ZUC_3G_128_EEA3) {
 		key_convert = ICP_QAT_HW_CIPHER_KEY_CONVERT;
-	else if (cdesc->qat_dir == ICP_QAT_HW_CIPHER_ENCRYPT)
+		cdesc->qat_dir = ICP_QAT_HW_CIPHER_ENCRYPT;
+	} else if (cdesc->qat_dir == ICP_QAT_HW_CIPHER_ENCRYPT)
 		key_convert = ICP_QAT_HW_CIPHER_NO_CONVERT;
 	else
 		key_convert = ICP_QAT_HW_CIPHER_KEY_CONVERT;
-- 
2.39.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-23 09:36:28.596764182 +0000
+++ 0007-crypto-qat-fix-stream-cipher-direction.patch	2023-02-23 09:36:28.170168909 +0000
@@ -1 +1 @@
-From 96ef7feb7a63ee74a99e221d255d91e8af3cf196 Mon Sep 17 00:00:00 2001
+From 09162b9e22428a67be570cab8b4231b5810ef246 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 96ef7feb7a63ee74a99e221d255d91e8af3cf196 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index ea1b729076..978ee49dce 100644
+index 10db656316..d397bde1ca 100644
@@ -22 +23 @@
-@@ -1884,9 +1884,10 @@ int qat_sym_cd_cipher_set(struct qat_sym_session *cdesc,
+@@ -1572,9 +1572,10 @@ int qat_sym_session_aead_create_cd_cipher(struct qat_sym_session *cdesc,
@@ -33,2 +34,2 @@
- 	else if (cdesc->qat_mode == ICP_QAT_HW_CIPHER_AEAD_MODE)
- 		key_convert = ICP_QAT_HW_CIPHER_NO_CONVERT;
+ 	else
+ 		key_convert = ICP_QAT_HW_CIPHER_KEY_CONVERT;


More information about the stable mailing list