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 3A98D457A1 for ; Mon, 12 Aug 2024 14:52:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3434C402C3; Mon, 12 Aug 2024 14:52:45 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2051.outbound.protection.outlook.com [40.107.101.51]) by mails.dpdk.org (Postfix) with ESMTP id A16624029C for ; Mon, 12 Aug 2024 14:52:43 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ryQxZY7nTyyQu4jEQkDDId746Wfweryvm0QJtL2OGpdVqDaikV1tsbxWutUgd50cIRdi8iV67YbBz5W7ZhnV49O6lRDFMlRsPZ9TQw/lx4DQ8KJB4Kk17C85DPLsV+UXVkya51ZZkxSOAHqz54c3nN/lTqlIy2gD5gt1nmzN4E/0CfnNg4q1Pown3hBZ/yGuuYEBGXdETlBAHESjNNTvns9tm2DRw5x8CayN5fTRrrvkagayXMbN65ccXQFShEEU1HU0Drx3wrUfyS4QqX9a3b3eiUWQyo1OSPCJlwpTupxxl2pztDti3FlfEYXVrZSfzx+ZnTokjY96FA9yGxzJ0Q== 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=bv4G24YyqlS6PgTujd19ZUSB13aE0cPHlPsO14okIhY=; b=a/SM7FeDFUefjNX3zH0MUwuJccpGk5JCBCSFC+mpcjqT56I2UMQ8JtGgEv/ltuIwrCDne4vmypnEg0C3XMkPXVvwmKxpjBMkoFEYT44psbqkmuiqmPLmEYcN//VpCEta61Dwt/GvDF5ZvarZc1LnwQsy/jfT9aviPsszLK3Uo2MclVfia7NwoIvnbLqhAr+zjKGAI7YgJrsOk1luRNjTX3xm4C/nKQ2jlJOUzvNMh/+j6vqnT/6l/r3sZWZAK/3VDTso/c9yE+05khQSuYepQCX9/qqCzLZVJTZQYKMwNdaVvsqHV+amAg7UqMAQspLfABF2ggYD8GBVnDv/yeTWwg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=bv4G24YyqlS6PgTujd19ZUSB13aE0cPHlPsO14okIhY=; b=U36M91jjhItIfE63MoUgkCM4kUXZgo7wQ3nmiuo4CSA0Odj/nfUD1yMDnU5aaszI1jmxWeiOhN2pg7iuUUCUHPEV5LKOYp02B/XOnTMiUim8DkgIBuQ4+my1f5QCrjOb5sANavLB5YQoBueUGLI0+xWGtOXqlhBezkcYuekq95vqe2ycCvxRbL70eoAESzJ38VbcocrHNH/c8Bl1zN950SJ6FAKXG3nx+FFKYmdBBSzksNJMTXzvSN5GBTA2wgmEDyp/EOHEwk33mqhugSjxKhGMKHR66pt/NhlXegbyK4ioaN5l7XYd46fSn3/KYN+zlkftlb4mlmMxRPTWclUcpg== Received: from SN1PR12CA0091.namprd12.prod.outlook.com (2603:10b6:802:21::26) by DS0PR12MB7510.namprd12.prod.outlook.com (2603:10b6:8:132::20) 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:39 +0000 Received: from SA2PEPF00003F68.namprd04.prod.outlook.com (2603:10b6:802:21:cafe::2e) by SN1PR12CA0091.outlook.office365.com (2603:10b6:802:21::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Mon, 12 Aug 2024 12:52:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SA2PEPF00003F68.mail.protection.outlook.com (10.167.248.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 12:52:39 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) 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 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:26 -0700 From: Xueming Li To: Gowrishankar Muthukrishnan CC: , dpdk stable Subject: patch 'crypto/cnxk: fix out-of-bound access' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:48:13 +0800 Message-ID: <20240812125035.389667-17-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: SA2PEPF00003F68:EE_|DS0PR12MB7510:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d8063bb-886e-414d-6762-08dcbacda5e3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?5BSLbymtegDqGUZUedsC4qnyh2dgArM5siZ6Gc7kT6mGTOOZeoTdpBj6LN1K?= =?us-ascii?Q?5BaYIt718NX0uglP+cp6fe4g1hdmODXJPK4GrPEnn+9nNJz2VSrAdtheigs4?= =?us-ascii?Q?JNg5ohSEAcZiW2zeektdXsiI3zmnnCd+jMHWS8f9DsYOQ6o17UuobiOuPzTO?= =?us-ascii?Q?LUHHLeiQQTQU6vJM/39oDiKw8MmamhJPW/6xTTJbuqOR4Zg17C643jW8v4+a?= =?us-ascii?Q?UZF77W1YL4pTFQ430W1wUs92M0cilFx42GfMadj6FQRjovktNdTQK8ipmjzu?= =?us-ascii?Q?NDbWUafe/yUQmE6O9/gzWQagLiw/meM3smqMsauBTo2Sg1/nJ4f2Yu2Q3AD6?= =?us-ascii?Q?yG5Dr/UIbWdXNC2tJNSJsgd+DZ7t3M7NI6ht0OaytmQ8xINl+E9BB+kwAtNf?= =?us-ascii?Q?XSTpq3oe2bpyzSFRs0gl3aPgafg+maSKnGteNf6qKGDZZfSIdCVnClt4YhyG?= =?us-ascii?Q?dBw0dTbrnQ2Q2nrEIlib3seiFKxapoEzrxx9mb2/5gyeV2P1YJPlICdnNbfA?= =?us-ascii?Q?pfNiUaZ6MHvawFD85EhFYtUm9BWgSzVrs9NwBJnfmdCbHrphm+eeraF3msHx?= =?us-ascii?Q?CCrZZfGf4Kj58BR+16h8CJxgl3YjGPuLTi3rknPQWHNuedDJTmLJwj2a1jOx?= =?us-ascii?Q?DbHQkP8GrqBO436EewqWKS13uk7+TLxWzFoz9YBeUNF5Mepf7WMLuD7cfHQT?= =?us-ascii?Q?oLNUdKDa0u/Ve+QjAJefT20NxdtLuTlLFQwudrCb6u+mV3wnbG3PgVCkyVb1?= =?us-ascii?Q?+khs/XFv5VzGduCxXNiPDqNRzp5gwHue1q0gmqoKQgtwWII/LiVMVq6FyxMJ?= =?us-ascii?Q?AvxWuobiCW88y9zSQd6HsgR+btgzHSuO6eJFQto8juevOpFV2Vn1+xDqDs4c?= =?us-ascii?Q?xwjgEaFLoAh0Lp0nGm5/rpjgO8ej9y5sO/rOnXIppYp/4J6+04hGSX+wUUdq?= =?us-ascii?Q?9SutVlvHKXD2OXj42jrU1ohu9vaBOm9UAiRgGOAALBZWUyt+nPmcd2mLhMdx?= =?us-ascii?Q?NOcRucUDKYeEVXUBpWHWQQLMLKGrUOfjvmg+zuS88p97U7VmInNj0R8n9436?= =?us-ascii?Q?mcVDVMC9UfSHhKRD7lsdSUdHLfsPdZltaQ/+S7r7fuIgymG/hkGDjpCFwFJN?= =?us-ascii?Q?uMBfD1G/KaBf/P8/B5HAqSlH3o77DhQ3nfWdMHafKRZ9169xgLb9FKrXdR0Q?= =?us-ascii?Q?OpWquREMA0bI/ddAAiI5kA1/GVFb+zEVunDHAZyO7Lqmxm+lKq7A4i303duy?= =?us-ascii?Q?pP/ntp3vzSf+mfPfL9wMG7WgMS5m2JIk0cW/3BLDK6D1qHNtTVgOsVqJg2PP?= =?us-ascii?Q?Xa4dcQntHJih8phiRWIdSYu83NL+C601tX3EYcmwg9v35CWMFE+kZKQ8kmiG?= =?us-ascii?Q?F7rtS1D35u6lsuUp/6m4w2JWChWON6wAIGlrg+t/r9pzFdK7hYF8gMMaewwo?= =?us-ascii?Q?slyT+5pUfp1Vm6LR1RWM23ExCqrUm4Lj?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(82310400026)(36860700013)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:52:39.2567 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3d8063bb-886e-414d-6762-08dcbacda5e3 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF00003F68.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7510 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=6034788bd6b026603f12aeafd566adf6bfc4d9ca Thanks. Xueming Li --- >From 6034788bd6b026603f12aeafd566adf6bfc4d9ca Mon Sep 17 00:00:00 2001 From: Gowrishankar Muthukrishnan Date: Sat, 15 Jun 2024 17:03:01 +0530 Subject: [PATCH] crypto/cnxk: fix out-of-bound access Cc: Xueming Li [ upstream commit 49ad3426882807bbeec22311bdb28fcab8c3ee13 ] Fix out-of-bound issues reported by coverity scan. Coverity issue: 403164, 403165, 403166, 403167, 403169, 403170, 403171, 403172, 403173, 403174, 403176, 403178, 403179, 403180 Fixes: 5686b573e4bb ("crypto/cnxk: support SM2") Fixes: badc0c6f6d6a ("cryptodev: set private and public keys in EC session") Signed-off-by: Gowrishankar Muthukrishnan --- drivers/common/cnxk/roc_ae.h | 16 +++++++++------- drivers/crypto/cnxk/cnxk_ae.h | 24 +++++++++++++++++++----- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/drivers/common/cnxk/roc_ae.h b/drivers/common/cnxk/roc_ae.h index a9a08d9fb9..7886b9d107 100644 --- a/drivers/common/cnxk/roc_ae.h +++ b/drivers/common/cnxk/roc_ae.h @@ -53,29 +53,31 @@ typedef enum { ROC_AE_ERR_ECC_POINT_NOT_ON_CURVE = 0x11 } roc_ae_error_code; +#define ROC_AE_EC_DATA_MAX 66 + /* Prime and order fields of built-in elliptic curves */ struct roc_ae_ec_group { struct { /* P521 maximum length */ - uint8_t data[66]; + uint8_t data[ROC_AE_EC_DATA_MAX]; unsigned int length; } prime; struct { /* P521 maximum length */ - uint8_t data[66]; + uint8_t data[ROC_AE_EC_DATA_MAX]; unsigned int length; } order; struct { /* P521 maximum length */ - uint8_t data[66]; + uint8_t data[ROC_AE_EC_DATA_MAX]; unsigned int length; } consta; struct { /* P521 maximum length */ - uint8_t data[66]; + uint8_t data[ROC_AE_EC_DATA_MAX]; unsigned int length; } constb; }; @@ -86,18 +88,18 @@ struct roc_ae_ec_ctx { /* Private key */ struct { - uint8_t data[66]; + uint8_t data[ROC_AE_EC_DATA_MAX]; unsigned int length; } pkey; /* Public key */ struct { struct { - uint8_t data[66]; + uint8_t data[ROC_AE_EC_DATA_MAX]; unsigned int length; } x; struct { - uint8_t data[66]; + uint8_t data[ROC_AE_EC_DATA_MAX]; unsigned int length; } y; } q; diff --git a/drivers/crypto/cnxk/cnxk_ae.h b/drivers/crypto/cnxk/cnxk_ae.h index ea11e093bf..a843d6b5ef 100644 --- a/drivers/crypto/cnxk/cnxk_ae.h +++ b/drivers/crypto/cnxk/cnxk_ae.h @@ -205,16 +205,22 @@ cnxk_ae_fill_ec_params(struct cnxk_ae_sess *sess, return 0; ec->pkey.length = xform->ec.pkey.length; - if (xform->ec.pkey.length) - rte_memcpy(ec->pkey.data, xform->ec.pkey.data, xform->ec.pkey.length); + if (ec->pkey.length > ROC_AE_EC_DATA_MAX) + ec->pkey.length = ROC_AE_EC_DATA_MAX; + if (ec->pkey.length) + rte_memcpy(ec->pkey.data, xform->ec.pkey.data, ec->pkey.length); ec->q.x.length = xform->ec.q.x.length; - if (xform->ec.q.x.length) - rte_memcpy(ec->q.x.data, xform->ec.q.x.data, xform->ec.q.x.length); + if (ec->q.x.length > ROC_AE_EC_DATA_MAX) + ec->q.x.length = ROC_AE_EC_DATA_MAX; + if (ec->q.x.length) + rte_memcpy(ec->q.x.data, xform->ec.q.x.data, ec->q.x.length); ec->q.y.length = xform->ec.q.y.length; + if (ec->q.y.length > ROC_AE_EC_DATA_MAX) + ec->q.y.length = ROC_AE_EC_DATA_MAX; if (xform->ec.q.y.length) - rte_memcpy(ec->q.y.data, xform->ec.q.y.data, xform->ec.q.y.length); + rte_memcpy(ec->q.y.data, xform->ec.q.y.data, ec->q.y.length); return 0; } @@ -735,7 +741,11 @@ cnxk_ae_sm2_sign_prep(struct rte_crypto_sm2_op_param *sm2, uint8_t *dptr; prime_len = ec_grp->prime.length; + if (prime_len > ROC_AE_EC_DATA_MAX) + prime_len = ROC_AE_EC_DATA_MAX; order_len = ec_grp->order.length; + if (order_len > ROC_AE_EC_DATA_MAX) + order_len = ROC_AE_EC_DATA_MAX; /* Truncate input length to curve prime length */ if (message_len > prime_len) @@ -822,7 +832,11 @@ cnxk_ae_sm2_verify_prep(struct rte_crypto_sm2_op_param *sm2, uint8_t *dptr; prime_len = ec_grp->prime.length; + if (prime_len > ROC_AE_EC_DATA_MAX) + prime_len = ROC_AE_EC_DATA_MAX; order_len = ec_grp->order.length; + if (order_len > ROC_AE_EC_DATA_MAX) + order_len = ROC_AE_EC_DATA_MAX; /* Truncate input length to curve prime length */ if (message_len > prime_len) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:03.150609149 +0800 +++ 0016-crypto-cnxk-fix-out-of-bound-access.patch 2024-08-12 20:44:01.905069257 +0800 @@ -1 +1 @@ -From 49ad3426882807bbeec22311bdb28fcab8c3ee13 Mon Sep 17 00:00:00 2001 +From 6034788bd6b026603f12aeafd566adf6bfc4d9ca Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 49ad3426882807bbeec22311bdb28fcab8c3ee13 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org