[dpdk-stable] patch 'common/cpt: check cipher and auth keys are set' has been queued to LTS release 18.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.7

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/20. 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/94dd77c11c5735575ae06280f10570fe1faf8261

Thanks.

Kevin.

---
>From 94dd77c11c5735575ae06280f10570fe1faf8261 Mon Sep 17 00:00:00 2001
From: Archana Muniganti <marchana at marvell.com>
Date: Wed, 5 Feb 2020 18:46:16 +0530
Subject: [PATCH] common/cpt: check cipher and auth keys are set

[ upstream commit e40175c5c56a6a355e022aec106400d25b4f294d ]

Returning error when cipher and auth key are not getting set

Fixes: 6cc54096520d ("crypto/octeontx: add supported sessions")

Signed-off-by: Archana Muniganti <marchana at marvell.com>
Signed-off-by: Anoob Joseph <anoobj at marvell.com>
---
 drivers/common/cpt/cpt_ucode.h | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h
index 3982239004..67f19bd379 100644
--- a/drivers/common/cpt/cpt_ucode.h
+++ b/drivers/common/cpt/cpt_ucode.h
@@ -299,5 +299,5 @@ cpt_fc_ciph_set_key(void *ctx, cipher_type_t type, uint8_t *key,
 		goto success;
 	default:
-		break;
+		return -1;
 	}
 
@@ -2631,8 +2631,11 @@ fill_sess_aead(struct rte_crypto_sym_xform *xform,
 	sess->aad_length = aead_form->aad_length;
 
-	cpt_fc_ciph_set_key(ctx, enc_type, aead_form->key.data,
-			aead_form->key.length, NULL);
+	if (unlikely(cpt_fc_ciph_set_key(ctx, enc_type, aead_form->key.data,
+			aead_form->key.length, NULL)))
+		return -1;
 
-	cpt_fc_auth_set_key(ctx, auth_type, NULL, 0, aead_form->digest_length);
+	if (unlikely(cpt_fc_auth_set_key(ctx, auth_type, NULL, 0,
+			aead_form->digest_length)))
+		return -1;
 
 	return 0;
@@ -2734,6 +2737,7 @@ fill_sess_cipher(struct rte_crypto_sym_xform *xform,
 	sess->is_null = is_null;
 
-	cpt_fc_ciph_set_key(SESS_PRIV(sess), enc_type, c_form->key.data,
-			    c_form->key.length, NULL);
+	if (unlikely(cpt_fc_ciph_set_key(SESS_PRIV(sess), enc_type,
+			c_form->key.data, c_form->key.length, NULL)))
+		return -1;
 
 	return 0;
@@ -2834,6 +2838,8 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform,
 		sess->auth_iv_length = a_form->iv.length;
 	}
-	cpt_fc_auth_set_key(SESS_PRIV(sess), auth_type, a_form->key.data,
-			    a_form->key.length, a_form->digest_length);
+	if (unlikely(cpt_fc_auth_set_key(SESS_PRIV(sess), auth_type,
+			a_form->key.data, a_form->key.length,
+			a_form->digest_length)))
+		return -1;
 
 	return 0;
@@ -2878,7 +2884,11 @@ fill_sess_gmac(struct rte_crypto_sym_xform *xform,
 	sess->mac_len = a_form->digest_length;
 
-	cpt_fc_ciph_set_key(ctx, enc_type, a_form->key.data,
-			a_form->key.length, NULL);
-	cpt_fc_auth_set_key(ctx, auth_type, NULL, 0, a_form->digest_length);
+	if (unlikely(cpt_fc_ciph_set_key(ctx, enc_type, a_form->key.data,
+			a_form->key.length, NULL)))
+		return -1;
+
+	if (unlikely(cpt_fc_auth_set_key(ctx, auth_type, NULL, 0,
+			a_form->digest_length)))
+		return -1;
 
 	return 0;
-- 
2.21.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-14 17:02:39.221247303 +0000
+++ 0039-common-cpt-check-cipher-and-auth-keys-are-set.patch	2020-02-14 17:02:37.057405726 +0000
@@ -1 +1 @@
-From e40175c5c56a6a355e022aec106400d25b4f294d Mon Sep 17 00:00:00 2001
+From 94dd77c11c5735575ae06280f10570fe1faf8261 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e40175c5c56a6a355e022aec106400d25b4f294d ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index 4ef87c298e..081249cd7b 100644
+index 3982239004..67f19bd379 100644
@@ -21 +22 @@
-@@ -299,5 +299,5 @@ cpt_fc_ciph_set_key(void *ctx, cipher_type_t type, const uint8_t *key,
+@@ -299,5 +299,5 @@ cpt_fc_ciph_set_key(void *ctx, cipher_type_t type, uint8_t *key,
@@ -28 +29 @@
-@@ -2617,8 +2617,11 @@ fill_sess_aead(struct rte_crypto_sym_xform *xform,
+@@ -2631,8 +2631,11 @@ fill_sess_aead(struct rte_crypto_sym_xform *xform,
@@ -43 +44 @@
-@@ -2720,6 +2723,7 @@ fill_sess_cipher(struct rte_crypto_sym_xform *xform,
+@@ -2734,6 +2737,7 @@ fill_sess_cipher(struct rte_crypto_sym_xform *xform,
@@ -53 +54 @@
-@@ -2815,6 +2819,8 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform,
+@@ -2834,6 +2838,8 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform,
@@ -64 +65 @@
-@@ -2859,7 +2865,11 @@ fill_sess_gmac(struct rte_crypto_sym_xform *xform,
+@@ -2878,7 +2884,11 @@ fill_sess_gmac(struct rte_crypto_sym_xform *xform,