[dpdk-stable] patch 'examples/ipsec-secgw: fix crash on unsupported algo' 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/13/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/f8d86d7b427dc21da922d33428c008bcdc638050

Thanks.

Kevin.

---
>From f8d86d7b427dc21da922d33428c008bcdc638050 Mon Sep 17 00:00:00 2001
From: Savinay Dharmappa <savinay.dharmappa at intel.com>
Date: Fri, 13 Dec 2019 11:49:55 +0000
Subject: [PATCH] examples/ipsec-secgw: fix crash on unsupported algo

[ upstream commit 71d9e6fb2a0d8709e97384b30d81b3bff35da16f ]

If algo is NULL set the status to error and return. This change
prevent crashing of ipsec-secgw application when a specific
cipher/auth/aead algo are not supported by application.

Fixes: 0d547ed03717 ("examples/ipsec-secgw: support configuration file")

Signed-off-by: Savinay Dharmappa <savinay.dharmappa at intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev at intel.com>
---
 examples/ipsec-secgw/sa.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index 30d1fb22d1..b303cb169b 100644
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -307,4 +307,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
 				"input \"%s\"", tokens[ti]);
 
+			if (status->status < 0)
+				return;
+
 			rule->cipher_algo = algo->algo;
 			rule->block_size = algo->block_size;
@@ -371,4 +374,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
 				"input \"%s\"", tokens[ti]);
 
+			if (status->status < 0)
+				return;
+
 			rule->auth_algo = algo->algo;
 			rule->auth_key_len = algo->key_len;
@@ -426,4 +432,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
 				"input \"%s\"", tokens[ti]);
 
+			if (status->status < 0)
+				return;
+
 			rule->aead_algo = algo->algo;
 			rule->cipher_key_len = algo->key_len;
-- 
2.21.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-07 15:08:18.153584384 +0000
+++ 0012-examples-ipsec-secgw-fix-crash-on-unsupported-algo.patch	2020-02-07 15:08:17.496063189 +0000
@@ -1 +1 @@
-From 71d9e6fb2a0d8709e97384b30d81b3bff35da16f Mon Sep 17 00:00:00 2001
+From f8d86d7b427dc21da922d33428c008bcdc638050 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 71d9e6fb2a0d8709e97384b30d81b3bff35da16f ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 7f046e3ed7..c75a5a15f5 100644
+index 30d1fb22d1..b303cb169b 100644
@@ -23 +24 @@
-@@ -315,4 +315,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
+@@ -307,4 +307,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
@@ -31 +32 @@
-@@ -379,4 +382,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
+@@ -371,4 +374,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
@@ -39 +40 @@
-@@ -434,4 +440,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
+@@ -426,4 +432,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,