[dpdk-stable] patch 'examples/fips_validation: fix auth verify' 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/17/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/6cd900d65c6cfd3d6d9c0f5cfb46be0353401c13

Thanks.

Kevin.

---
>From 6cd900d65c6cfd3d6d9c0f5cfb46be0353401c13 Mon Sep 17 00:00:00 2001
From: Fan Zhang <roy.fan.zhang at intel.com>
Date: Wed, 6 Nov 2019 10:54:25 +0000
Subject: [PATCH] examples/fips_validation: fix auth verify

[ upstream commit 82cfb9c24f66084e6c7933e6c00bca409bcc00e2 ]

Fixes: f64adb6714e0 ("examples/fips_validation: support HMAC parsing")

This patch fixes the incorrect mbuf write and digest memory leak in
fips_validation authentication verify.

Signed-off-by: Fan Zhang <roy.fan.zhang at intel.com>
Acked-by: Marko Kovacevic <marko.kovacevic at intel.com>
---
 examples/fips_validation/main.c | 60 ++++++++++-----------------------
 1 file changed, 17 insertions(+), 43 deletions(-)

diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c
index 40785decb..27558baa4 100644
--- a/examples/fips_validation/main.c
+++ b/examples/fips_validation/main.c
@@ -405,4 +405,5 @@ prepare_auth_op(void)
 {
 	struct rte_crypto_sym_op *sym = env.op->sym;
+	uint8_t *pt;
 
 	__rte_crypto_op_reset(env.op, RTE_CRYPTO_OP_TYPE_SYMMETRIC);
@@ -412,51 +413,24 @@ prepare_auth_op(void)
 	sym->auth.data.offset = 0;
 
-	if (info.op == FIPS_TEST_ENC_AUTH_GEN) {
-		uint8_t *pt;
+	pt = (uint8_t *)rte_pktmbuf_append(env.mbuf, vec.pt.len +
+			vec.cipher_auth.digest.len);
 
-		if (vec.pt.len > RTE_MBUF_MAX_NB_SEGS) {
-			RTE_LOG(ERR, USER1, "PT len %u\n", vec.pt.len);
-			return -EPERM;
-		}
+	if (!pt) {
+		RTE_LOG(ERR, USER1, "Error %i: MBUF too small\n",
+				-ENOMEM);
+		return -ENOMEM;
+	}
 
-		pt = (uint8_t *)rte_pktmbuf_append(env.mbuf, vec.pt.len +
+	sym->auth.data.length = vec.pt.len;
+	sym->auth.digest.data = pt + vec.pt.len;
+	sym->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
+			env.mbuf, vec.pt.len);
+
+	memcpy(pt, vec.pt.val, vec.pt.len);
+
+	if (info.op == FIPS_TEST_DEC_AUTH_VERIF)
+		memcpy(pt + vec.pt.len, vec.cipher_auth.digest.val,
 				vec.cipher_auth.digest.len);
 
-		if (!pt) {
-			RTE_LOG(ERR, USER1, "Error %i: MBUF too small\n",
-					-ENOMEM);
-			return -ENOMEM;
-		}
-
-		memcpy(pt, vec.pt.val, vec.pt.len);
-		sym->auth.data.length = vec.pt.len;
-		sym->auth.digest.data = pt + vec.pt.len;
-		sym->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
-				env.mbuf, vec.pt.len);
-
-	} else {
-		uint8_t *ct;
-
-		if (vec.ct.len > RTE_MBUF_MAX_NB_SEGS) {
-			RTE_LOG(ERR, USER1, "CT len %u\n", vec.ct.len);
-			return -EPERM;
-		}
-
-		ct = (uint8_t *)rte_pktmbuf_append(env.mbuf,
-				vec.ct.len + vec.cipher_auth.digest.len);
-
-		if (!ct) {
-			RTE_LOG(ERR, USER1, "Error %i: MBUF too small\n",
-					-ENOMEM);
-			return -ENOMEM;
-		}
-
-		memcpy(ct, vec.ct.val, vec.ct.len);
-		sym->auth.data.length = vec.ct.len;
-		sym->auth.digest.data = vec.cipher_auth.digest.val;
-		sym->auth.digest.phys_addr = rte_malloc_virt2iova(
-				sym->auth.digest.data);
-	}
-
 	rte_crypto_op_attach_sym_session(env.op, env.sess);
 
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-11 21:24:15.564071375 +0000
+++ 0036-examples-fips_validation-fix-auth-verify.patch	2019-12-11 21:24:12.669651176 +0000
@@ -1 +1 @@
-From 82cfb9c24f66084e6c7933e6c00bca409bcc00e2 Mon Sep 17 00:00:00 2001
+From 6cd900d65c6cfd3d6d9c0f5cfb46be0353401c13 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 82cfb9c24f66084e6c7933e6c00bca409bcc00e2 ]
+
@@ -7 +8,0 @@
-Cc: stable at dpdk.org
@@ -15,2 +16,2 @@
- examples/fips_validation/main.c | 62 ++++++++++-----------------------
- 1 file changed, 18 insertions(+), 44 deletions(-)
+ examples/fips_validation/main.c | 60 ++++++++++-----------------------
+ 1 file changed, 17 insertions(+), 43 deletions(-)
@@ -19 +20 @@
-index f8694ef96..9a2c8da61 100644
+index 40785decb..27558baa4 100644
@@ -22 +23 @@
-@@ -513,4 +513,5 @@ prepare_auth_op(void)
+@@ -405,4 +405,5 @@ prepare_auth_op(void)
@@ -28 +29 @@
-@@ -520,51 +521,24 @@ prepare_auth_op(void)
+@@ -412,51 +413,24 @@ prepare_auth_op(void)
@@ -40 +41,6 @@
--
++	if (!pt) {
++		RTE_LOG(ERR, USER1, "Error %i: MBUF too small\n",
++				-ENOMEM);
++		return -ENOMEM;
++	}
+ 
@@ -42,2 +48,11 @@
--				vec.cipher_auth.digest.len);
--
++	sym->auth.data.length = vec.pt.len;
++	sym->auth.digest.data = pt + vec.pt.len;
++	sym->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
++			env.mbuf, vec.pt.len);
++
++	memcpy(pt, vec.pt.val, vec.pt.len);
++
++	if (info.op == FIPS_TEST_DEC_AUTH_VERIF)
++		memcpy(pt + vec.pt.len, vec.cipher_auth.digest.val,
+ 				vec.cipher_auth.digest.len);
+ 
@@ -78,17 +93,2 @@
-+	if (!pt) {
-+		RTE_LOG(ERR, USER1, "Error %i: MBUF too small\n",
-+				-ENOMEM);
-+		return -ENOMEM;
- 	}
- 
-+	sym->auth.data.length = vec.pt.len;
-+	sym->auth.digest.data = pt + vec.pt.len;
-+	sym->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
-+			env.mbuf, vec.pt.len);
-+
-+	memcpy(pt, vec.pt.val, vec.pt.len);
-+
-+	if (info.op == FIPS_TEST_DEC_AUTH_VERIF)
-+		memcpy(pt + vec.pt.len, vec.cipher_auth.digest.val,
-+				vec.cipher_auth.digest.len);
-+
+-	}
+-