[dpdk-stable] patch 'examples/fips_validation: fix count overwrite for TDES' has been queued to LTS release 18.11.10

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

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

Thanks.

Kevin.

---
From 65dc134f9a0c0467a174d91b57f2d181e6dc8ce2 Mon Sep 17 00:00:00 2001
From: Archana Muniganti <marchana@marvell.com>
Date: Thu, 11 Jun 2020 19:14:17 +0530
Subject: [PATCH] examples/fips_validation: fix count overwrite for TDES

[ upstream commit 2b84d2bd47df6545797ed9841636eb8023c4db7b ]

Application updates first line of each test vector with
COUNT = i(where i = 1,2,3..) assuming first line contains
COUNT string. But few of the TDES input test vectors don't
contain COUNT string and thus COUNT is getting overwritten on
other data.

Fixes: 527cbf3d5ee3 ("examples/fips_validation: support TDES parsing")

Signed-off-by: Archana Muniganti <marchana@marvell.com>
Signed-off-by: Kanaka Durga Kotamarthy <kkotamarthy@marvell.com>
---
 examples/fips_validation/fips_validation.c | 8 ++++++++
 examples/fips_validation/main.c            | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c
index 6d14fe8ed4..489c8bac98 100644
--- a/examples/fips_validation/fips_validation.c
+++ b/examples/fips_validation/fips_validation.c
@@ -589,4 +589,12 @@ update_info_vec(uint32_t count)
 	cb = &info.writeback_callbacks[0];
 
+	if (!(strstr(info.vec[0], cb->key))) {
+		fprintf(info.fp_wr, "%s%u\n", cb->key, count);
+		i = 0;
+	} else {
+		snprintf(info.vec[0], strlen(info.vec[0]) + 4, "%s%u", cb->key,
+				count);
+		i = 1;
+	}
 	snprintf(info.vec[0], strlen(info.vec[0]) + 4, "%s%u", cb->key, count);
 
diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c
index 27558baa4a..d28569d23c 100644
--- a/examples/fips_validation/main.c
+++ b/examples/fips_validation/main.c
@@ -871,5 +871,8 @@ fips_mct_tdes_test(void)
 
 	for (i = 0; i < TDES_EXTERN_ITER; i++) {
-		if (i != 0)
+		if (i == 0) {
+			if (!(strstr(info.vec[0], "COUNT")))
+				fprintf(info.fp_wr, "%s%u\n", "COUNT = ", 0);
+		} else
 			update_info_vec(i);
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:17.073237627 +0100
+++ 0036-examples-fips_validation-fix-count-overwrite-for-TDE.patch	2020-08-20 16:26:15.832324397 +0100
@@ -1 +1 @@
-From 2b84d2bd47df6545797ed9841636eb8023c4db7b Mon Sep 17 00:00:00 2001
+From 65dc134f9a0c0467a174d91b57f2d181e6dc8ce2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2b84d2bd47df6545797ed9841636eb8023c4db7b ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 3aaec20fb4..9bdf257b8b 100644
+index 6d14fe8ed4..489c8bac98 100644
@@ -26 +27 @@
-@@ -641,4 +641,12 @@ update_info_vec(uint32_t count)
+@@ -589,4 +589,12 @@ update_info_vec(uint32_t count)
@@ -40 +41 @@
-index f9b2056bfc..efd32a86a5 100644
+index 27558baa4a..d28569d23c 100644
@@ -43 +44 @@
-@@ -1071,5 +1071,8 @@ fips_mct_tdes_test(void)
+@@ -871,5 +871,8 @@ fips_mct_tdes_test(void)