From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 147CC457A1 for ; Mon, 12 Aug 2024 14:52:52 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0A8F840669; Mon, 12 Aug 2024 14:52:52 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2043.outbound.protection.outlook.com [40.107.100.43]) by mails.dpdk.org (Postfix) with ESMTP id 48E614029C for ; Mon, 12 Aug 2024 14:52:50 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Z3sj1jcOrUgY2HVly9E573Cs17fTT0pdAWG3mX2Ey55juZGvjUUqkwcbva1W1ngEI1x6FnKtZr4fmKhrALPLkPYRiGtam2rJu+z5NKyMzkucmXYqTzrO9RdNJZwvxrQv2psecRx/O6L1mfa01fjPqMOWPigTw4uwF9/4jgCesqhcCl1SzvQxeTDg2HCJK7X4nEL4IE3oRyRbV/zSskcvO4qac5KQB9uSvNCTomAV9GJcu+53qPjZfkRABYchg8eZf2IvbDJGla7g/wkTw21gwglvSp+Lv6jPwTyxy3sJXmuGbFNfvfsgGQyco3wO3IT7OQkFam7qkobTTLoW8VReGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vAxLieheo6ow41ej7sZvD/DcURegxrZykYhaB4cSPVE=; b=eOSYSPD9h9kPUc1W9Nv9hpfBTz771+aC5KRkT+VwO3xGuc0a0J0ighCYEY1OxPs2/yaT9/vJdQARYfgBACy7NVywerqwoYv+ioOoQLdVgjhtp2nST1wSEUlv1C4sRoM/g6qhUYRbAMurs2iFjbCAOY1TjM42VF0fjztS7M6KP1XiS7kHpf+WtXdcop7PiQMoVTBbypgcYkNxRNy4QS34+7uIEz60Vm4xkSbVTQP+VKcaUhmC7+yVM6NehPqil0r+OYhzeCoUK4ygNFKdUHcrfJHAz1O17vmkdXGEeb55hGVHcg/udUUhZK8soM/a+J6VccoxW4W+IbMOGQUb1u4jkw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vAxLieheo6ow41ej7sZvD/DcURegxrZykYhaB4cSPVE=; b=Pw5dVp59qZgOekaKLFZ8+0WnGz/wchXwvurCVIkG7gBKxdnjLm8q633bya82VYB99NKW8Nh+tIN1sQjwcz0Kzji63hzCyCsKkFBerCKy2ysCvapm4cIOhs2amB6KR38Xbj/QGwahGkqi3gLHPUKKmH/zqCnQdlTzNxFhkEH4SGNbkg9YN5zPpJ9ACbiVFqtdLZFu7Q+arH/hwI99p9lRGoKg98pIEZlqSOjaloBAWKTvJujYdcOSE+cpae5q20jdILOZY63puTYiJT3t7AJnA6Qc3DoOUSPagQJ9NsTDwOBIC2qBozFY5PNf3a4WnmQHXWnH40CU28xeD3uR7DdLSg== Received: from DM6PR08CA0042.namprd08.prod.outlook.com (2603:10b6:5:1e0::16) by DS7PR12MB8291.namprd12.prod.outlook.com (2603:10b6:8:e6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:52:43 +0000 Received: from DS1PEPF00017094.namprd03.prod.outlook.com (2603:10b6:5:1e0:cafe::62) by DM6PR08CA0042.outlook.office365.com (2603:10b6:5:1e0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20 via Frontend Transport; Mon, 12 Aug 2024 12:52:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS1PEPF00017094.mail.protection.outlook.com (10.167.17.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:52:43 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 05:52:30 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 05:52:28 -0700 From: Xueming Li To: Gowrishankar Muthukrishnan CC: , Anoob Joseph , dpdk stable Subject: patch 'crypto/cnxk: fix ECDH public key verification' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:48:14 +0800 Message-ID: <20240812125035.389667-18-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF00017094:EE_|DS7PR12MB8291:EE_ X-MS-Office365-Filtering-Correlation-Id: d5044ef4-48ea-4de8-9aa5-08dcbacda841 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?nDDMcHigVMYIr0UQsttgEK1VsUNI/6k2zNX8yE7fkxwcMICOddjPAhl4kvlh?= =?us-ascii?Q?uIPCF13gUnX9cJvWjH0MyNgi5tI78D/mV1nPX7SCpx7Zgi7BevdxThSW9xZV?= =?us-ascii?Q?fCjtT4PiBsAjLxg/DcUx1GIMDt0lywhZaPAPWltgpCBXCmIi0HAL9+RDdaRL?= =?us-ascii?Q?k/o49KutBEJMGcJkurp4pxToKSK+xetJJwGS//l36XmlHh2cbqLaBgLe0oPF?= =?us-ascii?Q?qbfOWq6ZScmcnPSqcIugzNEQv4Oe/z+EmEqeAOtDMVeBSspSEFLcTgR82z1x?= =?us-ascii?Q?44Z2S44a60Wnv35MRlwTeVB3wstWuD/dfBDla8WXJ1hBY8VcgmTe/fRlVqDz?= =?us-ascii?Q?FhzfqnFjaF+tPhlEfFzWMjkGaz1WVZhAHvQl1HlJVz3lVpeMrExKJL0IJ0WF?= =?us-ascii?Q?JXzaShkmMFR8xIuFfkx8esJqCDncjI8uoLka2z5WO9q7SqtYK5oSg22U+F/W?= =?us-ascii?Q?19NlhDF5urwP9OykofdodJ489l+hYy/rsWD3UprcXNI6muV6ppLizmlPjLPo?= =?us-ascii?Q?g2PyfsitbH1xZ1GoPR0189BMvlEw4JCOPRvG6VR/4pEmGSthCsl5wpvqskTR?= =?us-ascii?Q?VzrZw4gxHkIKl5SAM10m65wTYrgDUQdCLBar9Sz7A0/8ajnOK/WAgQ47KYJx?= =?us-ascii?Q?5j87/5426f0CABYdRN63tvQ4dOlE/LNXbhLXdmhWV5Kh2l8OxDQqpqlPm2JM?= =?us-ascii?Q?jUiJtHiRlKP3DaTYPBy0R8ErZ5ngUlfyn0UmqKmfMNoXQRc9d/xKetnhqJDC?= =?us-ascii?Q?S8Donu3YTyj1cbsNBj2MwYQMr0NMAvQh1nIDtQ+q34BAPZam954qDmSt7s5W?= =?us-ascii?Q?Zs8E3x8BApndy674Uu332frZEFBtnnS4FLscpw3wZWBmSEysU/wE6l4+ax1g?= =?us-ascii?Q?fUwFMa3RGsk1c6wPjkFcLOAAyGVF4nAhbVuuBrye4/hNbFjSAGp0TXyllgLY?= =?us-ascii?Q?dHE1mNPbofbr5QWLmtRcePUQx/guKuooEwSsSXYumENfP4vW8X7SSnTH0kjy?= =?us-ascii?Q?CegJrhhxCxbd5Jh/9hutYxyo0kzFxFaUG9pmZ/c8bEM8TWPw9fenGrRzAbUV?= =?us-ascii?Q?6xT0mElbmmAaqMRluYH5FQkb5seH+B2kXuwBFXX5X2DqSw/rYXxQ1IjsoJmy?= =?us-ascii?Q?cOSlAZK1HwEExVhyEq6b9n4teJA0O2vD8MZK/zXZPeUEL6Q5/1tKkrRSm6NB?= =?us-ascii?Q?l0ywRNiwIQ2ycqeipOdsOwVSK2Tm24wEnHHEQoErDZTPdFJm9747tUFlTlu3?= =?us-ascii?Q?wcK6R3aRnKp6PNjgdgmzrh/WBcWTpw7i9dtSWOrSZaNBuzdhgwDggVraTK5+?= =?us-ascii?Q?gVHdH6VfOK4LMDc+wldabbgU7XfVwW+OvdEJC7ljZWOqPlL6hXnshhyu5EGG?= =?us-ascii?Q?VM3UDvBJRKU67UN7tKydRHeSHgaEJtqbQ/P7nvW6tmEgLbmYN3r9xED0ZUf7?= =?us-ascii?Q?UCDMaPQd8LwkUgHK9guuzUpYrR6aoLU9?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(82310400026)(376014)(1800799024)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:52:43.2295 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d5044ef4-48ea-4de8-9aa5-08dcbacda841 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF00017094.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB8291 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 23.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/14/24. 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. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=e585a0db98dbdbed54addd2cec7db937a4a6377a Thanks. Xueming Li --- >From e585a0db98dbdbed54addd2cec7db937a4a6377a Mon Sep 17 00:00:00 2001 From: Gowrishankar Muthukrishnan Date: Sat, 15 Jun 2024 17:04:31 +0530 Subject: [PATCH] crypto/cnxk: fix ECDH public key verification Cc: Xueming Li [ upstream commit d29c4e0a4bea2d8aac548371115402579e6dd5f8 ] Public key verification is applicable only for ECDH. Incorrect check in current dequeue operation leads to malfunction on ECDSA verification, hence added an additional check. Fixes: baae0994fa96 ("crypto/cnxk: support ECDH") Fixes: 5c9025583167 ("crypto/cnxk: fix CN9K ECDH public key verification") Signed-off-by: Gowrishankar Muthukrishnan Acked-by: Anoob Joseph --- drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 23 ++++++++++++++--------- drivers/crypto/cnxk/cn9k_cryptodev_ops.c | 21 +++++++++++++-------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c index 997110e3d3..c96cf2b3a1 100644 --- a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c @@ -861,15 +861,20 @@ cn10k_cpt_dequeue_post_process(struct cnxk_cpt_qp *qp, return; } else if (cop->type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC && - cop->sess_type == RTE_CRYPTO_OP_WITH_SESSION && - cop->asym->ecdh.ke_type == RTE_CRYPTO_ASYM_KE_PUB_KEY_VERIFY) { - if (likely(compcode == CPT_COMP_GOOD)) { - if (uc_compcode == ROC_AE_ERR_ECC_POINT_NOT_ON_CURVE) { - cop->status = RTE_CRYPTO_OP_STATUS_ERROR; - return; - } else if (uc_compcode == ROC_AE_ERR_ECC_PAI) { - cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS; - return; + cop->sess_type == RTE_CRYPTO_OP_WITH_SESSION) { + struct cnxk_ae_sess *sess; + + sess = (struct cnxk_ae_sess *)cop->asym->session; + if (sess->xfrm_type == RTE_CRYPTO_ASYM_XFORM_ECDH && + cop->asym->ecdh.ke_type == RTE_CRYPTO_ASYM_KE_PUB_KEY_VERIFY) { + if (likely(compcode == CPT_COMP_GOOD)) { + if (uc_compcode == ROC_AE_ERR_ECC_POINT_NOT_ON_CURVE) { + cop->status = RTE_CRYPTO_OP_STATUS_ERROR; + return; + } else if (uc_compcode == ROC_AE_ERR_ECC_PAI) { + cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS; + return; + } } } } diff --git a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c index 442cd8e5a9..eb5575b7ec 100644 --- a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c @@ -579,14 +579,19 @@ cn9k_cpt_dequeue_post_process(struct cnxk_cpt_qp *qp, struct rte_crypto_op *cop, if (res->uc_compcode == ROC_SE_ERR_GC_ICV_MISCOMPARE) cop->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED; else if (cop->type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC && - cop->sess_type == RTE_CRYPTO_OP_WITH_SESSION && - cop->asym->ecdh.ke_type == RTE_CRYPTO_ASYM_KE_PUB_KEY_VERIFY) { - if (res->uc_compcode == ROC_AE_ERR_ECC_POINT_NOT_ON_CURVE) { - cop->status = RTE_CRYPTO_OP_STATUS_ERROR; - return; - } else if (res->uc_compcode == ROC_AE_ERR_ECC_PAI) { - cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS; - return; + cop->sess_type == RTE_CRYPTO_OP_WITH_SESSION) { + struct cnxk_ae_sess *sess; + + sess = (struct cnxk_ae_sess *)cop->asym->session; + if (sess->xfrm_type == RTE_CRYPTO_ASYM_XFORM_ECDH && + cop->asym->ecdh.ke_type == RTE_CRYPTO_ASYM_KE_PUB_KEY_VERIFY) { + if (res->uc_compcode == ROC_AE_ERR_ECC_POINT_NOT_ON_CURVE) { + cop->status = RTE_CRYPTO_OP_STATUS_ERROR; + return; + } else if (res->uc_compcode == ROC_AE_ERR_ECC_PAI) { + cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS; + return; + } } } else cop->status = RTE_CRYPTO_OP_STATUS_ERROR; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:03.177609747 +0800 +++ 0017-crypto-cnxk-fix-ECDH-public-key-verification.patch 2024-08-12 20:44:01.915069259 +0800 @@ -1 +1 @@ -From d29c4e0a4bea2d8aac548371115402579e6dd5f8 Mon Sep 17 00:00:00 2001 +From e585a0db98dbdbed54addd2cec7db937a4a6377a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d29c4e0a4bea2d8aac548371115402579e6dd5f8 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 720b756001..07bd13b16d 100644 +index 997110e3d3..c96cf2b3a1 100644 @@ -25 +27 @@ -@@ -1186,15 +1186,20 @@ cn10k_cpt_dequeue_post_process(struct cnxk_cpt_qp *qp, struct rte_crypto_op *cop +@@ -861,15 +861,20 @@ cn10k_cpt_dequeue_post_process(struct cnxk_cpt_qp *qp, @@ -56 +58 @@ -index 96a75a7797..f443cb9563 100644 +index 442cd8e5a9..eb5575b7ec 100644 @@ -59 +61 @@ -@@ -523,14 +523,19 @@ cn9k_cpt_dequeue_post_process(struct cnxk_cpt_qp *qp, struct rte_crypto_op *cop, +@@ -579,14 +579,19 @@ cn9k_cpt_dequeue_post_process(struct cnxk_cpt_qp *qp, struct rte_crypto_op *cop,