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 7EB22A04B5 for ; Tue, 3 Dec 2019 19:29:00 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 76236235; Tue, 3 Dec 2019 19:29:00 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 8E8BC235 for ; Tue, 3 Dec 2019 19:28:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397738; 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=jBo/DpnUjfHyygv3XzUAzFG8+wlEaln9TJ6O9nVsKSw=; b=C3w41aV0fTZ7dYQ4kDzkuvarlDvru1L/hA9s/yLmqcs8qCe5ykR10fIMOj+8LDrJwWBuID 5oMXwxjoro0YWCUTCWAgl0a8FoqDKcmhJzYf1Oa5m6OdV5YHKodvkZCNPYK0nyV019NFMQ w08Ba5N9ot1LQf30vwUigQt11gBtc0o= 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-140-prUUsOQqOTWW8kPboJ1iZQ-1; Tue, 03 Dec 2019 13:28:56 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id C49FB477; Tue, 3 Dec 2019 18:28:55 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id B087B5C3FA; Tue, 3 Dec 2019 18:28:54 +0000 (UTC) From: Kevin Traynor To: Vakul Garg Cc: Akhil Goyal , dpdk stable Date: Tue, 3 Dec 2019 18:26:56 +0000 Message-Id: <20191203182714.17297-47-ktraynor@redhat.com> In-Reply-To: <20191203182714.17297-1-ktraynor@redhat.com> References: <20191203182714.17297-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: prUUsOQqOTWW8kPboJ1iZQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'crypto/dpaa_sec: fix auth-cipher check for AEAD' has been queued to LTS release 18.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/10/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 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/1c2a3f592eea26b4ae= 046169936c98eda70ec5a2 Thanks. Kevin. --- >From 1c2a3f592eea26b4ae046169936c98eda70ec5a2 Mon Sep 17 00:00:00 2001 From: Vakul Garg Date: Mon, 14 Oct 2019 12:23:23 +0530 Subject: [PATCH] crypto/dpaa_sec: fix auth-cipher check for AEAD [ upstream commit 98e84273902045640b2c6ecc438412c4f1202e15 ] The code shall also check aead as non auth-cipher case Fixes: 1f14d500bce1 ("crypto/dpaa_sec: support IPsec protocol offload") Signed-off-by: Vakul Garg Acked-by: Akhil Goyal --- drivers/crypto/dpaa_sec/dpaa_sec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/d= paa_sec.c index c0602ce39..90c3b8efa 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -262,5 +262,6 @@ static inline int is_auth_cipher(dpaa_sec_session *ses) =09return ((ses->cipher_alg !=3D RTE_CRYPTO_CIPHER_NULL) && =09=09(ses->auth_alg !=3D RTE_CRYPTO_AUTH_NULL) && -=09=09(ses->proto_alg !=3D RTE_SECURITY_PROTOCOL_IPSEC)); +=09=09(ses->proto_alg !=3D RTE_SECURITY_PROTOCOL_IPSEC) && +=09=09(ses->aead_alg =3D=3D 0)); } =20 --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:54.496043911 +0000 +++ 0047-crypto-dpaa_sec-fix-auth-cipher-check-for-AEAD.patch=092019-12-03 = 17:29:51.771749516 +0000 @@ -1 +1 @@ -From 98e84273902045640b2c6ecc438412c4f1202e15 Mon Sep 17 00:00:00 2001 +From 1c2a3f592eea26b4ae046169936c98eda70ec5a2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 98e84273902045640b2c6ecc438412c4f1202e15 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 17c175604..27a922676 100644 +index c0602ce39..90c3b8efa 100644 @@ -21 +22,2 @@ -@@ -267,5 +267,6 @@ static inline int is_auth_cipher(dpaa_sec_session *ses= ) +@@ -262,5 +262,6 @@ static inline int is_auth_cipher(dpaa_sec_session *ses= ) + =09return ((ses->cipher_alg !=3D RTE_CRYPTO_CIPHER_NULL) && @@ -23 +24,0 @@ - =09=09(ses->proto_alg !=3D RTE_SECURITY_PROTOCOL_PDCP) &&