[dpdk-stable] patch 'crypto/aesni_mb: fix CCM digest size check' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 10/30/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.

Thanks.

Luca Boccassi

---
>From 33e87f16a377adee2907103cef178f6eb5674911 Mon Sep 17 00:00:00 2001
From: Pablo de Lara <pablo.de.lara.guarch at intel.com>
Date: Fri, 9 Oct 2020 12:05:19 +0000
Subject: [PATCH] crypto/aesni_mb: fix CCM digest size check

[ upstream commit 07bfb9047ba12f169e09606be72e821facbf88c2 ]

Digest size for CCM was being checked for other algorithms
apart from CCM.

Fixes: c4c0c312a823 ("crypto/aesni_mb: check for invalid digest size")

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
---
 drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 29 +++++++++++-----------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
index 40feae3c62..8850934f1f 100644
--- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
+++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
@@ -537,6 +537,14 @@ aesni_mb_set_session_aead_parameters(const MB_MGR *mb_mgr,
 		return -EINVAL;
 	}
 
+	/* Set IV parameters */
+	sess->iv.offset = xform->aead.iv.offset;
+	sess->iv.length = xform->aead.iv.length;
+
+	/* Set digest sizes */
+	sess->auth.req_digest_len = xform->aead.digest_length;
+	sess->auth.gen_digest_len = sess->auth.req_digest_len;
+
 	switch (xform->aead.algo) {
 	case RTE_CRYPTO_AEAD_AES_CCM:
 		sess->cipher.mode = CCM;
@@ -555,6 +563,13 @@ aesni_mb_set_session_aead_parameters(const MB_MGR *mb_mgr,
 			return -EINVAL;
 		}
 
+		/* CCM digests must be between 4 and 16 and an even number */
+		if (sess->auth.req_digest_len < AES_CCM_DIGEST_MIN_LEN ||
+				sess->auth.req_digest_len > AES_CCM_DIGEST_MAX_LEN ||
+				(sess->auth.req_digest_len & 1) == 1) {
+			AESNI_MB_LOG(ERR, "Invalid digest size\n");
+			return -EINVAL;
+		}
 		break;
 
 	case RTE_CRYPTO_AEAD_AES_GCM:
@@ -589,20 +604,6 @@ aesni_mb_set_session_aead_parameters(const MB_MGR *mb_mgr,
 		return -ENOTSUP;
 	}
 
-	/* Set IV parameters */
-	sess->iv.offset = xform->aead.iv.offset;
-	sess->iv.length = xform->aead.iv.length;
-
-	sess->auth.req_digest_len = xform->aead.digest_length;
-	/* CCM digests must be between 4 and 16 and an even number */
-	if (sess->auth.req_digest_len < AES_CCM_DIGEST_MIN_LEN ||
-			sess->auth.req_digest_len > AES_CCM_DIGEST_MAX_LEN ||
-			(sess->auth.req_digest_len & 1) == 1) {
-		AESNI_MB_LOG(ERR, "Invalid digest size\n");
-		return -EINVAL;
-	}
-	sess->auth.gen_digest_len = sess->auth.req_digest_len;
-
 	return 0;
 }
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:16.488872615 +0000
+++ 0153-crypto-aesni_mb-fix-CCM-digest-size-check.patch	2020-10-28 10:35:11.748833616 +0000
@@ -1,13 +1,14 @@
-From 07bfb9047ba12f169e09606be72e821facbf88c2 Mon Sep 17 00:00:00 2001
+From 33e87f16a377adee2907103cef178f6eb5674911 Mon Sep 17 00:00:00 2001
 From: Pablo de Lara <pablo.de.lara.guarch at intel.com>
 Date: Fri, 9 Oct 2020 12:05:19 +0000
 Subject: [PATCH] crypto/aesni_mb: fix CCM digest size check
 
+[ upstream commit 07bfb9047ba12f169e09606be72e821facbf88c2 ]
+
 Digest size for CCM was being checked for other algorithms
 apart from CCM.
 
 Fixes: c4c0c312a823 ("crypto/aesni_mb: check for invalid digest size")
-Cc: stable at dpdk.org
 
 Signed-off-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
 ---
@@ -15,10 +16,10 @@
  1 file changed, 15 insertions(+), 14 deletions(-)
 
 diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
-index 34a39ca992..ba2882d276 100644
+index 40feae3c62..8850934f1f 100644
 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
 +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
-@@ -661,6 +661,14 @@ aesni_mb_set_session_aead_parameters(const MB_MGR *mb_mgr,
+@@ -537,6 +537,14 @@ aesni_mb_set_session_aead_parameters(const MB_MGR *mb_mgr,
  		return -EINVAL;
  	}
  
@@ -33,7 +34,7 @@
  	switch (xform->aead.algo) {
  	case RTE_CRYPTO_AEAD_AES_CCM:
  		sess->cipher.mode = CCM;
-@@ -679,6 +687,13 @@ aesni_mb_set_session_aead_parameters(const MB_MGR *mb_mgr,
+@@ -555,6 +563,13 @@ aesni_mb_set_session_aead_parameters(const MB_MGR *mb_mgr,
  			return -EINVAL;
  		}
  
@@ -47,7 +48,7 @@
  		break;
  
  	case RTE_CRYPTO_AEAD_AES_GCM:
-@@ -713,20 +728,6 @@ aesni_mb_set_session_aead_parameters(const MB_MGR *mb_mgr,
+@@ -589,20 +604,6 @@ aesni_mb_set_session_aead_parameters(const MB_MGR *mb_mgr,
  		return -ENOTSUP;
  	}