From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D1E18A0542 for ; Fri, 7 Feb 2020 16:13:50 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C99E91C11E; Fri, 7 Feb 2020 16:13:50 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 751151C11E for ; Fri, 7 Feb 2020 16:13:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581088429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PrDEufPhzQvKMrmki+3z7yetvAy4hEwxhk8vKUOSrSQ=; b=aQC/iXxXLkG/LvfzslLp5xIX5M9p0RJumDfM5Yz0ybOmPC2LiavjmkcGXYpvaWEYsGZFHG 50rLmYTc1XyxjGCNB8Umz4VLa2BO2NP0ev1zIABobB4dz7fAkgPvEEKoHeseXlUqJZhCP1 7+6KWemSwPmXEmL1/IJ3WXtnhTZGgHw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-362-GcFpDZ2DMIOqZ9Fa1Yd92w-1; Fri, 07 Feb 2020 10:13:31 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1626B8010EF; Fri, 7 Feb 2020 15:13:30 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0D1810016DA; Fri, 7 Feb 2020 15:13:28 +0000 (UTC) From: Kevin Traynor To: Savinay Dharmappa Cc: Konstantin Ananyev , dpdk stable Date: Fri, 7 Feb 2020 15:12:24 +0000 Message-Id: <20200207151248.29804-12-ktraynor@redhat.com> In-Reply-To: <20200207151248.29804-1-ktraynor@redhat.com> References: <20200207151248.29804-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: GcFpDZ2DMIOqZ9Fa1Yd92w-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'examples/ipsec-secgw: fix crash on unsupported algo' has been queued to LTS release 18.11.7 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 rebasi= ng (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/f8d86d7b427dc21da9= 22d33428c008bcdc638050 Thanks. Kevin. --- >From f8d86d7b427dc21da922d33428c008bcdc638050 Mon Sep 17 00:00:00 2001 From: Savinay Dharmappa 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 Acked-by: Konstantin Ananyev --- 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, =09=09=09=09"input \"%s\"", tokens[ti]); =20 +=09=09=09if (status->status < 0) +=09=09=09=09return; + =09=09=09rule->cipher_algo =3D algo->algo; =09=09=09rule->block_size =3D algo->block_size; @@ -371,4 +374,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, =09=09=09=09"input \"%s\"", tokens[ti]); =20 +=09=09=09if (status->status < 0) +=09=09=09=09return; + =09=09=09rule->auth_algo =3D algo->algo; =09=09=09rule->auth_key_len =3D algo->key_len; @@ -426,4 +432,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, =09=09=09=09"input \"%s\"", tokens[ti]); =20 +=09=09=09if (status->status < 0) +=09=09=09=09return; + =09=09=09rule->aead_algo =3D algo->algo; =09=09=09rule->cipher_key_len =3D algo->key_len; --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-07 15:08:18.153584384 +0000 +++ 0012-examples-ipsec-secgw-fix-crash-on-unsupported-algo.patch=092020-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@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,