patch 'crypto/dpaax_sec: fix auth/cipher xform chain checks' has been queued to stable release 20.11.5

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.5

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/20/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/bluca/dpdk-stable

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

Thanks.

Luca Boccassi

---
>From cf9be042906ea3717203f1f07d7ba9aeac0f0a12 Mon Sep 17 00:00:00 2001
From: Hemant Agrawal <hemant.agrawal at nxp.com>
Date: Thu, 10 Feb 2022 16:28:50 +0530
Subject: [PATCH] crypto/dpaax_sec: fix auth/cipher xform chain checks

[ upstream commit 99cc26f6652caa2c779fd169cadd62a1c365d52f ]

This patch add more checks on next type for PDCP cases.

Fixes: 45e019608f31 ("crypto/dpaa2_sec: support integrity only PDCP")
Fixes: a1173d55598c ("crypto/dpaa_sec: support PDCP offload")

Signed-off-by: Hemant Agrawal <hemant.agrawal at nxp.com>
---
 drivers/crypto/dpaa_sec/dpaa_sec.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c
index 94c3a4bbca..9179cccf83 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -2881,11 +2881,13 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev,
 	/* find xfrm types */
 	if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER) {
 		cipher_xform = &xform->cipher;
-		if (xform->next != NULL)
+		if (xform->next != NULL &&
+			xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH)
 			auth_xform = &xform->next->auth;
 	} else if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH) {
 		auth_xform = &xform->auth;
-		if (xform->next != NULL)
+		if (xform->next != NULL &&
+			xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER)
 			cipher_xform = &xform->next->cipher;
 	} else {
 		DPAA_SEC_ERR("Invalid crypto type");
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-18 12:37:42.327925990 +0000
+++ 0120-crypto-dpaax_sec-fix-auth-cipher-xform-chain-checks.patch	2022-02-18 12:37:37.882796208 +0000
@@ -1 +1 @@
-From 99cc26f6652caa2c779fd169cadd62a1c365d52f Mon Sep 17 00:00:00 2001
+From cf9be042906ea3717203f1f07d7ba9aeac0f0a12 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 99cc26f6652caa2c779fd169cadd62a1c365d52f ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -14,3 +15,2 @@
- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 6 ++++--
- drivers/crypto/dpaa_sec/dpaa_sec.c          | 6 ++++--
- 2 files changed, 8 insertions(+), 4 deletions(-)
+ drivers/crypto/dpaa_sec/dpaa_sec.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
@@ -18,22 +17,0 @@
-diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
-index 444e1f0043..cb8aaf6446 100644
---- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
-+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
-@@ -3231,13 +3231,15 @@ dpaa2_sec_set_pdcp_session(struct rte_cryptodev *dev,
- 	/* find xfrm types */
- 	if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER) {
- 		cipher_xform = &xform->cipher;
--		if (xform->next != NULL) {
-+		if (xform->next != NULL &&
-+			xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH) {
- 			session->ext_params.aead_ctxt.auth_cipher_text = true;
- 			auth_xform = &xform->next->auth;
- 		}
- 	} else if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH) {
- 		auth_xform = &xform->auth;
--		if (xform->next != NULL) {
-+		if (xform->next != NULL &&
-+			xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER) {
- 			session->ext_params.aead_ctxt.auth_cipher_text = false;
- 			cipher_xform = &xform->next->cipher;
- 		}
@@ -41 +19 @@
-index 1137b142e9..75e437f696 100644
+index 94c3a4bbca..9179cccf83 100644
@@ -44 +22 @@
-@@ -2984,11 +2984,13 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev,
+@@ -2881,11 +2881,13 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev,