From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 08AB61B455 for ; Thu, 31 Jan 2019 16:49:50 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5397AC0BFBA1; Thu, 31 Jan 2019 15:49:49 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-200.ams2.redhat.com [10.36.117.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA5195C207; Thu, 31 Jan 2019 15:49:47 +0000 (UTC) From: Kevin Traynor To: Konstantin Ananyev Cc: Bernard Iremonger , Radu Nicolau , Akhil Goyal , dpdk stable Date: Thu, 31 Jan 2019 15:48:18 +0000 Message-Id: <20190131154901.5383-10-ktraynor@redhat.com> In-Reply-To: <20190131154901.5383-1-ktraynor@redhat.com> References: <20190131154901.5383-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 31 Jan 2019 15:49:49 +0000 (UTC) Subject: [dpdk-stable] patch 'examples/ipsec-secgw: fix inbound SA checking' has been queued to LTS release 18.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2019 15:49:50 -0000 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 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 Acked-by: Radu Nicolau Acked-by: Akhil Goyal Signed-off-by: Konstantin Ananyev --- 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 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@dpdk.org Signed-off-by: Bernard Iremonger Acked-by: Radu Nicolau @@ -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)