[dpdk-stable] patch 'examples/ipsec-secgw: fix inbound SA checking' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.1

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/07/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.

Thanks.

Kevin Traynor

---
>From d561eb50a01cacd0cba15b01f5722116d4cdf1c2 Mon Sep 17 00:00:00 2001
From: Konstantin Ananyev <konstantin.ananyev at intel.com>
Date: Thu, 10 Jan 2019 21:09:09 +0000
Subject: [PATCH] examples/ipsec-secgw: fix inbound SA checking

[ upstream commit e0dac065f2a232e8060c479a094c7f58cfc93cf9 ]

In the inbound_sa_check() make sure that sa pointer stored
inside mbuf private area is not NULL.

Fixes: d299106e8e31 ("examples/ipsec-secgw: add IPsec sample application")

Signed-off-by: Bernard Iremonger <bernard.iremonger at intel.com>
Acked-by: Radu Nicolau <radu.nicolau at intel.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
Signed-off-by: Konstantin Ananyev <konstantin.ananyev at intel.com>
---
 examples/ipsec-secgw/sa.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index d2d3550a4..640f1d793 100644
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -948,8 +948,13 @@ inbound_sa_check(struct sa_ctx *sa_ctx, struct rte_mbuf *m, uint32_t sa_idx)
 {
 	struct ipsec_mbuf_metadata *priv;
+	struct ipsec_sa *sa;
 
 	priv = get_priv(m);
+	sa = priv->sa;
+	if (sa != NULL)
+		return (sa_ctx->sa[sa_idx].spi == sa->spi);
 
-	return (sa_ctx->sa[sa_idx].spi == priv->sa->spi);
+	RTE_LOG(ERR, IPSEC, "SA not saved in private data\n");
+	return 0;
 }
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-31 15:44:05.982433662 +0000
+++ 0010-examples-ipsec-secgw-fix-inbound-SA-checking.patch	2019-01-31 15:44:05.000000000 +0000
@@ -1,13 +1,14 @@
-From e0dac065f2a232e8060c479a094c7f58cfc93cf9 Mon Sep 17 00:00:00 2001
+From d561eb50a01cacd0cba15b01f5722116d4cdf1c2 Mon Sep 17 00:00:00 2001
 From: Konstantin Ananyev <konstantin.ananyev at intel.com>
 Date: Thu, 10 Jan 2019 21:09:09 +0000
 Subject: [PATCH] examples/ipsec-secgw: fix inbound SA checking
 
+[ upstream commit e0dac065f2a232e8060c479a094c7f58cfc93cf9 ]
+
 In the inbound_sa_check() make sure that sa pointer stored
 inside mbuf private area is not NULL.
 
 Fixes: d299106e8e31 ("examples/ipsec-secgw: add IPsec sample application")
-Cc: stable at dpdk.org
 
 Signed-off-by: Bernard Iremonger <bernard.iremonger at intel.com>
 Acked-by: Radu Nicolau <radu.nicolau at intel.com>
@@ -18,7 +19,7 @@
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
-index f6271bc60..839aaca0c 100644
+index d2d3550a4..640f1d793 100644
 --- a/examples/ipsec-secgw/sa.c
 +++ b/examples/ipsec-secgw/sa.c
 @@ -948,8 +948,13 @@ inbound_sa_check(struct sa_ctx *sa_ctx, struct rte_mbuf *m, uint32_t sa_idx)