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 B6573A054C for ; Fri, 14 Feb 2020 18:06:27 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AE07E11A4; Fri, 14 Feb 2020 18:06:27 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 17C4F11A4 for ; Fri, 14 Feb 2020 18:06:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581699985; 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=V9cGAeQjh4cHhxI/bwtIZxgIEYruCpZ3JEoW4AVwJRE=; b=WGf2oAWHBxLAKlfjQHSkFDlem5nVJQ19kEls2gKyJbEEunUunNk89AgFbXgsBS8ulZr7lz 3RAwIFx07jR4+m+YEkdmtRwMl1Qie2u6g2EJOcOqQhzMjO+dq1dNlcsgo0Q5+1djL4yEOY AJ3Lw/7fA0lAxBaLMFNU+RGGwBrRvnM= 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-32-ibiKy95vNkKuKZv6DoHtuQ-1; Fri, 14 Feb 2020 12:06:20 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BC1DB18C35A1; Fri, 14 Feb 2020 17:06:19 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id DC29B84BCD; Fri, 14 Feb 2020 17:06:17 +0000 (UTC) From: Kevin Traynor To: Archana Muniganti Cc: Anoob Joseph , dpdk stable Date: Fri, 14 Feb 2020 17:03:33 +0000 Message-Id: <20200214170337.25093-39-ktraynor@redhat.com> In-Reply-To: <20200214170337.25093-1-ktraynor@redhat.com> References: <20200214170337.25093-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: ibiKy95vNkKuKZv6DoHtuQ-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 'common/cpt: check cipher and auth keys are set' 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/20/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/94dd77c11c5735575a= e06280f10570fe1faf8261 Thanks. Kevin. --- >From 94dd77c11c5735575ae06280f10570fe1faf8261 Mon Sep 17 00:00:00 2001 From: Archana Muniganti Date: Wed, 5 Feb 2020 18:46:16 +0530 Subject: [PATCH] common/cpt: check cipher and auth keys are set [ upstream commit e40175c5c56a6a355e022aec106400d25b4f294d ] Returning error when cipher and auth key are not getting set Fixes: 6cc54096520d ("crypto/octeontx: add supported sessions") Signed-off-by: Archana Muniganti Signed-off-by: Anoob Joseph --- drivers/common/cpt/cpt_ucode.h | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.= h index 3982239004..67f19bd379 100644 --- a/drivers/common/cpt/cpt_ucode.h +++ b/drivers/common/cpt/cpt_ucode.h @@ -299,5 +299,5 @@ cpt_fc_ciph_set_key(void *ctx, cipher_type_t type, uint= 8_t *key, =09=09goto success; =09default: -=09=09break; +=09=09return -1; =09} =20 @@ -2631,8 +2631,11 @@ fill_sess_aead(struct rte_crypto_sym_xform *xform, =09sess->aad_length =3D aead_form->aad_length; =20 -=09cpt_fc_ciph_set_key(ctx, enc_type, aead_form->key.data, -=09=09=09aead_form->key.length, NULL); +=09if (unlikely(cpt_fc_ciph_set_key(ctx, enc_type, aead_form->key.data, +=09=09=09aead_form->key.length, NULL))) +=09=09return -1; =20 -=09cpt_fc_auth_set_key(ctx, auth_type, NULL, 0, aead_form->digest_length); +=09if (unlikely(cpt_fc_auth_set_key(ctx, auth_type, NULL, 0, +=09=09=09aead_form->digest_length))) +=09=09return -1; =20 =09return 0; @@ -2734,6 +2737,7 @@ fill_sess_cipher(struct rte_crypto_sym_xform *xform, =09sess->is_null =3D is_null; =20 -=09cpt_fc_ciph_set_key(SESS_PRIV(sess), enc_type, c_form->key.data, -=09=09=09 c_form->key.length, NULL); +=09if (unlikely(cpt_fc_ciph_set_key(SESS_PRIV(sess), enc_type, +=09=09=09c_form->key.data, c_form->key.length, NULL))) +=09=09return -1; =20 =09return 0; @@ -2834,6 +2838,8 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform, =09=09sess->auth_iv_length =3D a_form->iv.length; =09} -=09cpt_fc_auth_set_key(SESS_PRIV(sess), auth_type, a_form->key.data, -=09=09=09 a_form->key.length, a_form->digest_length); +=09if (unlikely(cpt_fc_auth_set_key(SESS_PRIV(sess), auth_type, +=09=09=09a_form->key.data, a_form->key.length, +=09=09=09a_form->digest_length))) +=09=09return -1; =20 =09return 0; @@ -2878,7 +2884,11 @@ fill_sess_gmac(struct rte_crypto_sym_xform *xform, =09sess->mac_len =3D a_form->digest_length; =20 -=09cpt_fc_ciph_set_key(ctx, enc_type, a_form->key.data, -=09=09=09a_form->key.length, NULL); -=09cpt_fc_auth_set_key(ctx, auth_type, NULL, 0, a_form->digest_length); +=09if (unlikely(cpt_fc_ciph_set_key(ctx, enc_type, a_form->key.data, +=09=09=09a_form->key.length, NULL))) +=09=09return -1; + +=09if (unlikely(cpt_fc_auth_set_key(ctx, auth_type, NULL, 0, +=09=09=09a_form->digest_length))) +=09=09return -1; =20 =09return 0; --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-14 17:02:39.221247303 +0000 +++ 0039-common-cpt-check-cipher-and-auth-keys-are-set.patch=092020-02-14 1= 7:02:37.057405726 +0000 @@ -1 +1 @@ -From e40175c5c56a6a355e022aec106400d25b4f294d Mon Sep 17 00:00:00 2001 +From 94dd77c11c5735575ae06280f10570fe1faf8261 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e40175c5c56a6a355e022aec106400d25b4f294d ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 4ef87c298e..081249cd7b 100644 +index 3982239004..67f19bd379 100644 @@ -21 +22 @@ -@@ -299,5 +299,5 @@ cpt_fc_ciph_set_key(void *ctx, cipher_type_t type, con= st uint8_t *key, +@@ -299,5 +299,5 @@ cpt_fc_ciph_set_key(void *ctx, cipher_type_t type, uin= t8_t *key, @@ -28 +29 @@ -@@ -2617,8 +2617,11 @@ fill_sess_aead(struct rte_crypto_sym_xform *xform, +@@ -2631,8 +2631,11 @@ fill_sess_aead(struct rte_crypto_sym_xform *xform, @@ -43 +44 @@ -@@ -2720,6 +2723,7 @@ fill_sess_cipher(struct rte_crypto_sym_xform *xform, +@@ -2734,6 +2737,7 @@ fill_sess_cipher(struct rte_crypto_sym_xform *xform, @@ -53 +54 @@ -@@ -2815,6 +2819,8 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform, +@@ -2834,6 +2838,8 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform, @@ -64 +65 @@ -@@ -2859,7 +2865,11 @@ fill_sess_gmac(struct rte_crypto_sym_xform *xform, +@@ -2878,7 +2884,11 @@ fill_sess_gmac(struct rte_crypto_sym_xform *xform,