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 88C25A051C for ; Tue, 11 Feb 2020 12:42:42 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D1C461C0CF; Tue, 11 Feb 2020 12:42:40 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by dpdk.org (Postfix) with ESMTP id 04E5F1C0C2 for ; Tue, 11 Feb 2020 12:42:40 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id m10so2079097wmc.0 for ; Tue, 11 Feb 2020 03:42:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/SIclOMJyZtMJDoifAl0HJ0H2jBCsQD73DFCsonKSlM=; b=f+Y+Ak1OJpaCUgoz2qjvP90bARsSxmd/JoMeRnduHTc0omRbMlu4TsxVUShVbQn1tE vGbkhLezSQuoY+hXdJ32YsKZ7Ruw7dyamP8AqgMX4Gaq5rLoB2odm8tFYkzAS5Z8VYhD cHCZVCZgvj2PTUOXi/72nrtx/Gzxi1jQOfK50eww47v5c58V9fvvM3rHuEHDbHBLyo5b KB8BaFRh4R3AufvsRWL+XhjryiX+UDjJ/9pSt2c+uo95tuF9BtrRNchX4RKEIImKSHGp qt8QH0++kXUnyzBPoWXS5ZFjgcBxZbHWm1Q2isnzwixOve9LUQse6E8YmgkK1vOv31/6 xtrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/SIclOMJyZtMJDoifAl0HJ0H2jBCsQD73DFCsonKSlM=; b=O3EMgArbOFrSXup3c83ANbNnSdH3I3rqZbbx1ifopsx/cEp1xm7+YFJXYb55QRDDsf UWeUs7HyUuLfpVPXwJmlsT8gXK5XIqTYbkgv2egmWzK/UHvzfhzwp6tVYSJ4rP56qT7A r/hL3fJfSh9Vj3OM69DZMO2hBXlBFXi6WiXtUM/XmV3gdXgxttg1e1XrGrc1Iz5Ve3zq TLFQBJ7jrOg5mpbFOqMSElVkG3Q9MuS9O6UqyDTaDWR6EqMA6XCk7Eh9OaPwgoHSnZu6 1lYjy1/PMdGm1+RZuo35mWhMOnevHSGbED/XQcFQByip3zt8U0pg0Pj8JbJd5Gxe9YD4 SvJg== X-Gm-Message-State: APjAAAXz/PrRaqGUfdU91kyCVBbFMFm7OPwZ4Zy5KsK0v8JsoCPfkIQK /+8dpqKKwwTrhEQOlutQuHA= X-Google-Smtp-Source: APXvYqyFa0+nJyxFx6OLbmPflZedGMzFB9ZpK5NfS/g3egNi9ZAdRmECq3UruSyaNTOrCoj3Qooc+w== X-Received: by 2002:a05:600c:2113:: with SMTP id u19mr5111637wml.78.1581421359734; Tue, 11 Feb 2020 03:42:39 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id e17sm3341289wma.12.2020.02.11.03.42.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:42:39 -0800 (PST) From: luca.boccassi@gmail.com To: Archana Muniganti Cc: Anoob Joseph , dpdk stable Date: Tue, 11 Feb 2020 11:22:11 +0000 Message-Id: <20200211112216.3929-185-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'common/cpt: check cipher and auth keys are set' has been queued to stable release 19.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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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/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 rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 1d601e575b3b05b913c40cb610051d57cae1adde 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 d5a0135d73..979870c754 100644 --- a/drivers/common/cpt/cpt_ucode.h +++ b/drivers/common/cpt/cpt_ucode.h @@ -298,7 +298,7 @@ cpt_fc_ciph_set_key(void *ctx, cipher_type_t type, const uint8_t *key, cpt_fc_ciph_set_key_kasumi_f8_cbc(cpt_ctx, key, key_len); goto success; default: - break; + return -1; } /* Only for FC_GEN case */ @@ -2620,10 +2620,13 @@ fill_sess_aead(struct rte_crypto_sym_xform *xform, sess->iv_length = aead_form->iv.length; sess->aad_length = aead_form->aad_length; - cpt_fc_ciph_set_key(ctx, enc_type, aead_form->key.data, - aead_form->key.length, NULL); + if (unlikely(cpt_fc_ciph_set_key(ctx, enc_type, aead_form->key.data, + aead_form->key.length, NULL))) + return -1; - cpt_fc_auth_set_key(ctx, auth_type, NULL, 0, aead_form->digest_length); + if (unlikely(cpt_fc_auth_set_key(ctx, auth_type, NULL, 0, + aead_form->digest_length))) + return -1; return 0; } @@ -2723,8 +2726,9 @@ fill_sess_cipher(struct rte_crypto_sym_xform *xform, sess->iv_length = c_form->iv.length; sess->is_null = is_null; - cpt_fc_ciph_set_key(SESS_PRIV(sess), enc_type, c_form->key.data, - c_form->key.length, NULL); + if (unlikely(cpt_fc_ciph_set_key(SESS_PRIV(sess), enc_type, + c_form->key.data, c_form->key.length, NULL))) + return -1; return 0; } @@ -2823,8 +2827,10 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform, sess->auth_iv_offset = a_form->iv.offset; sess->auth_iv_length = a_form->iv.length; } - cpt_fc_auth_set_key(SESS_PRIV(sess), auth_type, a_form->key.data, - a_form->key.length, a_form->digest_length); + if (unlikely(cpt_fc_auth_set_key(SESS_PRIV(sess), auth_type, + a_form->key.data, a_form->key.length, + a_form->digest_length))) + return -1; return 0; } @@ -2867,9 +2873,13 @@ fill_sess_gmac(struct rte_crypto_sym_xform *xform, sess->iv_length = a_form->iv.length; sess->mac_len = a_form->digest_length; - cpt_fc_ciph_set_key(ctx, enc_type, a_form->key.data, - a_form->key.length, NULL); - cpt_fc_auth_set_key(ctx, auth_type, NULL, 0, a_form->digest_length); + if (unlikely(cpt_fc_ciph_set_key(ctx, enc_type, a_form->key.data, + a_form->key.length, NULL))) + return -1; + + if (unlikely(cpt_fc_auth_set_key(ctx, auth_type, NULL, 0, + a_form->digest_length))) + return -1; return 0; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:44.946369379 +0000 +++ 0185-common-cpt-check-cipher-and-auth-keys-are-set.patch 2020-02-11 11:17:38.836009499 +0000 @@ -1,12 +1,13 @@ -From e40175c5c56a6a355e022aec106400d25b4f294d Mon Sep 17 00:00:00 2001 +From 1d601e575b3b05b913c40cb610051d57cae1adde 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") -Cc: stable@dpdk.org Signed-off-by: Archana Muniganti Signed-off-by: Anoob Joseph @@ -15,7 +16,7 @@ 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h -index 4ef87c298e..081249cd7b 100644 +index d5a0135d73..979870c754 100644 --- a/drivers/common/cpt/cpt_ucode.h +++ b/drivers/common/cpt/cpt_ucode.h @@ -298,7 +298,7 @@ cpt_fc_ciph_set_key(void *ctx, cipher_type_t type, const uint8_t *key, @@ -27,7 +28,7 @@ } /* Only for FC_GEN case */ -@@ -2616,10 +2616,13 @@ fill_sess_aead(struct rte_crypto_sym_xform *xform, +@@ -2620,10 +2620,13 @@ fill_sess_aead(struct rte_crypto_sym_xform *xform, sess->iv_length = aead_form->iv.length; sess->aad_length = aead_form->aad_length; @@ -44,7 +45,7 @@ return 0; } -@@ -2719,8 +2722,9 @@ fill_sess_cipher(struct rte_crypto_sym_xform *xform, +@@ -2723,8 +2726,9 @@ fill_sess_cipher(struct rte_crypto_sym_xform *xform, sess->iv_length = c_form->iv.length; sess->is_null = is_null; @@ -56,7 +57,7 @@ return 0; } -@@ -2814,8 +2818,10 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform, +@@ -2823,8 +2827,10 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform, sess->auth_iv_offset = a_form->iv.offset; sess->auth_iv_length = a_form->iv.length; } @@ -69,7 +70,7 @@ return 0; } -@@ -2858,9 +2864,13 @@ fill_sess_gmac(struct rte_crypto_sym_xform *xform, +@@ -2867,9 +2873,13 @@ fill_sess_gmac(struct rte_crypto_sym_xform *xform, sess->iv_length = a_form->iv.length; sess->mac_len = a_form->digest_length;