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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/26/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 c60c846704d54c8456446f308b5065c08cde4772 Mon Sep 17 00:00:00 2001
From: Archana Muniganti <marchana at 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 at marvell.com>
Signed-off-by: Kanaka Durga Kotamarthy <kkotamarthy at 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 bffc682de..303f03495 100644
--- a/examples/fips_validation/fips_validation.c
+++ b/examples/fips_validation/fips_validation.c
@@ -634,6 +634,14 @@ 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);
 
 	for (i = 1; i < info.nb_vec_lines; i++) {
diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c
index 9a2c8da61..693ad9b48 100644
--- a/examples/fips_validation/main.c
+++ b/examples/fips_validation/main.c
@@ -1030,7 +1030,10 @@ fips_mct_tdes_test(void)
 	int test_mode = info.interim_info.tdes_data.test_mode;
 
 	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);
 
 		fips_test_write_one_case();
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:54.393053800 +0100
+++ 0151-examples-fips_validation-fix-count-overwrite-for-TDE.patch	2020-07-24 12:53:48.515010708 +0100
@@ -1,8 +1,10 @@
-From 2b84d2bd47df6545797ed9841636eb8023c4db7b Mon Sep 17 00:00:00 2001
+From c60c846704d54c8456446f308b5065c08cde4772 Mon Sep 17 00:00:00 2001
 From: Archana Muniganti <marchana at 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
@@ -10,7 +12,6 @@
 other data.
 
 Fixes: 527cbf3d5ee3 ("examples/fips_validation: support TDES parsing")
-Cc: stable at dpdk.org
 
 Signed-off-by: Archana Muniganti <marchana at marvell.com>
 Signed-off-by: Kanaka Durga Kotamarthy <kkotamarthy at marvell.com>
@@ -20,10 +21,10 @@
  2 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c
-index 3aaec20fb..9bdf257b8 100644
+index bffc682de..303f03495 100644
 --- a/examples/fips_validation/fips_validation.c
 +++ b/examples/fips_validation/fips_validation.c
-@@ -640,6 +640,14 @@ update_info_vec(uint32_t count)
+@@ -634,6 +634,14 @@ update_info_vec(uint32_t count)
  
  	cb = &info.writeback_callbacks[0];
  
@@ -39,10 +40,10 @@
  
  	for (i = 1; i < info.nb_vec_lines; i++) {
 diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c
-index f9b2056bf..efd32a86a 100644
+index 9a2c8da61..693ad9b48 100644
 --- a/examples/fips_validation/main.c
 +++ b/examples/fips_validation/main.c
-@@ -1070,7 +1070,10 @@ fips_mct_tdes_test(void)
+@@ -1030,7 +1030,10 @@ fips_mct_tdes_test(void)
  	int test_mode = info.interim_info.tdes_data.test_mode;
  
  	for (i = 0; i < TDES_EXTERN_ITER; i++) {