[dpdk-stable] patch 'crypto/dpaa_sec: fix auth-cipher check for AEAD' has been queued to LTS release 18.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/10/19. 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-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/1c2a3f592eea26b4ae046169936c98eda70ec5a2

Thanks.

Kevin.

---
>From 1c2a3f592eea26b4ae046169936c98eda70ec5a2 Mon Sep 17 00:00:00 2001
From: Vakul Garg <vakul.garg at nxp.com>
Date: Mon, 14 Oct 2019 12:23:23 +0530
Subject: [PATCH] crypto/dpaa_sec: fix auth-cipher check for AEAD

[ upstream commit 98e84273902045640b2c6ecc438412c4f1202e15 ]

The code shall also check aead as non auth-cipher case

Fixes: 1f14d500bce1 ("crypto/dpaa_sec: support IPsec protocol offload")

Signed-off-by: Vakul Garg <vakul.garg at nxp.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
---
 drivers/crypto/dpaa_sec/dpaa_sec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c
index c0602ce39..90c3b8efa 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -262,5 +262,6 @@ static inline int is_auth_cipher(dpaa_sec_session *ses)
 	return ((ses->cipher_alg != RTE_CRYPTO_CIPHER_NULL) &&
 		(ses->auth_alg != RTE_CRYPTO_AUTH_NULL) &&
-		(ses->proto_alg != RTE_SECURITY_PROTOCOL_IPSEC));
+		(ses->proto_alg != RTE_SECURITY_PROTOCOL_IPSEC) &&
+		(ses->aead_alg == 0));
 }
 
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-03 17:29:54.496043911 +0000
+++ 0047-crypto-dpaa_sec-fix-auth-cipher-check-for-AEAD.patch	2019-12-03 17:29:51.771749516 +0000
@@ -1 +1 @@
-From 98e84273902045640b2c6ecc438412c4f1202e15 Mon Sep 17 00:00:00 2001
+From 1c2a3f592eea26b4ae046169936c98eda70ec5a2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 98e84273902045640b2c6ecc438412c4f1202e15 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index 17c175604..27a922676 100644
+index c0602ce39..90c3b8efa 100644
@@ -21 +22,2 @@
-@@ -267,5 +267,6 @@ static inline int is_auth_cipher(dpaa_sec_session *ses)
+@@ -262,5 +262,6 @@ static inline int is_auth_cipher(dpaa_sec_session *ses)
+ 	return ((ses->cipher_alg != RTE_CRYPTO_CIPHER_NULL) &&
@@ -23 +24,0 @@
- 		(ses->proto_alg != RTE_SECURITY_PROTOCOL_PDCP) &&