From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 7CC7D457A1
for <public@inbox.dpdk.org>; Mon, 12 Aug 2024 14:53:12 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 74FA0402C3;
Mon, 12 Aug 2024 14:53:12 +0200 (CEST)
Received: from NAM12-MW2-obe.outbound.protection.outlook.com
(mail-mw2nam12on2065.outbound.protection.outlook.com [40.107.244.65])
by mails.dpdk.org (Postfix) with ESMTP id E54164029C
for <stable@dpdk.org>; Mon, 12 Aug 2024 14:53:10 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=ED0G7ZenWPdMtPF5g2XO/8BDbgbEzHMK+jzo83xHTC+go0TOKRCtlq4mMwic3c4wyXWUJR8sMYGgo1ahkq7xRWiEwL35JklPd0MoN0AU2qEC1AhT75FfJikWXoPBuga6yE851faow+PxxPSJbkZBSzarFusWc6dWplu2JMiT/FfEnMWz8oR2zhf91PFs5oUhYMo8X4TxNdui9RsAw3DCxvizDJ0mcpzmcFbHb0X75iIttuTIiQh7JBvajHeUWTvzUs9oo40Le4f7MZkWX1fKEzZMN5/gRH6gpR9ZbZ9QYFw4mK6laXS2AjxHOXzGrOMte5Gab9d8n7w7ATLMxqFr9w==
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=tD0NevRuMX2YlVTdQDxaUzEoIkTzF4/YXQiqz4+2Il0=;
b=jQl1EaYYzlN8I0ElwtmlSGA3FW3HRaxCO3Y67BHJc5Hkpjj6eX0aj6+7tF1cHNNtHvZ5PDUvZe7NyfMdUGGsOSBHqeV6tW8qlyZbTU3Nlv/KIapuj3CZ/x+7X7q2tYA0+wVymwshR0A0ceeUeoFtPcpclPVPB6AqDZms1GQIj1p9Snoa1L7xcz1ULDzjU0FHLyh8BQcdwcEgGiuxV4MSn/5R5RZey4UArnqLaKmtIAhzDaicCSThOaJxjAeoa+DclSptWvnU1iTR/kbrFjy3+FN5cOO+eAC87hfkjr0+qIa3gv6SHRIRVOYTcWgd/WTOkhsaz/IQpKh94xiShgqGRA==
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=tD0NevRuMX2YlVTdQDxaUzEoIkTzF4/YXQiqz4+2Il0=;
b=P7GNmHSJ5lbdYwImvf1rFGzqYBrdEBVwGX9HD/bZed/BzH+jz0Q1xCuW7xExlB8tP2B3+Dy4PWYnvf+jVgse3GUDfMVKnzRDI4Iz7U7DVDJsWZGJlqCVtq8GPZNs8Wg+O/cf/TYb1AwPy1fqHSXOH2skeTGqma2sYJuNIR1/+kbzX3yr381GNWRuDkRBCc2FLGESXPW3Q4SwehBNG/gf93oSiIPV9LvMDeDD06woxm3JXvL3Pq+JhEtCoDFrstwwQ406+MECzH1YhTDQaTnbGczdCLr1IXVLcDTJk87JXdhegehNlxjnj0YmQ6hpfePkopxyUympDDn8liDBnSVXCg==
Received: from SA9PR13CA0166.namprd13.prod.outlook.com (2603:10b6:806:28::21)
by DS7PR12MB6288.namprd12.prod.outlook.com (2603:10b6:8:93::7) with
Microsoft
SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.7849.22; Mon, 12 Aug 2024 12:53:07 +0000
Received: from SA2PEPF00003F67.namprd04.prod.outlook.com
(2603:10b6:806:28:cafe::59) by SA9PR13CA0166.outlook.office365.com
(2603:10b6:806:28::21) 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:53:06 +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
SA2PEPF00003F67.mail.protection.outlook.com (10.167.248.42) 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:53:06 +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:55 -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:53 -0700
From: Xueming Li <xuemingl@nvidia.com>
To: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>
CC: <xuemingl@nvidia.com>, dpdk stable <stable@dpdk.org>
Subject: patch 'crypto/cnxk: fix minimal input normalization' has been queued
to stable release 23.11.2
Date: Mon, 12 Aug 2024 20:48:18 +0800
Message-ID: <20240812125035.389667-22-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: SA2PEPF00003F67:EE_|DS7PR12MB6288:EE_
X-MS-Office365-Filtering-Correlation-Id: 425dc45c-9f7b-4b07-bc42-08dcbacdb628
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?pOc2SSYVivlwJo0Xv5jbJTkOcuTXImRgkRc1bxnGSoSqhUukIGnGMnLWyci3?=
=?us-ascii?Q?eqSPJYnS+e96SHgRENdaMTNtPLFJJWjnC2FMz4WqUSXMNXPCEmc34GCbXUtt?=
=?us-ascii?Q?cqZ1WJ9/G3CnsQBAQNYMDaLDn1hylRihrbtdEQ4E6bHkCul+KI2uf9p0VCBw?=
=?us-ascii?Q?82tzy55PhTbb8RLbovdm8igG05565IfVPmaRzqkLUgDcKXwN+KaZdsoPF9kj?=
=?us-ascii?Q?O5Mvc5UrX6aRYruxNVWYqfMfgQeJfAW0AXNLWrffWs7mgcZzpcHroDCVzs2R?=
=?us-ascii?Q?Iw98eSHIS13TynGVaFpKKD8oV3MQFcaAZIJ3Dr2WkopXhPvAqSxu1vn5wtuG?=
=?us-ascii?Q?pGi4zyG5yia5KN1PrZ0HndLiq/dDsoxhSRrgU4Eorlm/Kq2PlJJriU7mNlUI?=
=?us-ascii?Q?Md2DJgs+mzqMZUQaaD/94xgCawFIa3UlJQK89UcwmHk71si3UTBhIQIrQn+2?=
=?us-ascii?Q?BMKR9/ZcwGx0GR/uQu5PYxq9Yu/X/JuXHH39VdsPBklZDwvX/EM7DcRFjOIx?=
=?us-ascii?Q?NGdHo33yKzZXbVaNVZ6bkz+RzK1g+qd4jV6lUWTnwfcH/qHxQQObyHPvjbkt?=
=?us-ascii?Q?W0qjWGKU37NTyT0QJt36dkg2+IOEgaYNIBzgZUnWXB0xx35KbCdMMIK3bO72?=
=?us-ascii?Q?yaMneMONyXavGLmaqcmDWieIu+odkb2niaxBr9mE4EPt+PJ9h5S8v0kyqyjS?=
=?us-ascii?Q?ZQhfGXgo8d0C5pPHP8HdFxF3JP3WXIjrtW0SZ2xvLeyIqMrzuuC97TCjYwqi?=
=?us-ascii?Q?rjI19aFSv0INAjcBRlDwDWCk1H1uBCDgcA3gqo1lOV9rf/b875qkz7AMeE7f?=
=?us-ascii?Q?xBemfGDI9RdIXoLUJBf5uZeOhWyLYjsQxeDB1pZtEX8+3iPOxTJ0IJI/5qK3?=
=?us-ascii?Q?WoQSvFNV46BkmMYatu8ZhS9rQXgoSdJS984ESdFOd63vDwCibQP7WCnZfQg6?=
=?us-ascii?Q?8Fi5BxSyPjFrCbcPMAClQ6ndLUKondGiEvu2M43Zc/0YY6KuAxT7hnA7AJ5t?=
=?us-ascii?Q?ymj50nc2InELdeIbe2n9NKl2NLhz6OY7Wd1k9JCDkIj8xXEofwDfsd7Z2u7j?=
=?us-ascii?Q?kqvjJAeFR3LXRrt2tPc8s98zLd0X0t/OhogoQL9RvSChw/auvrTuKyghjjQ1?=
=?us-ascii?Q?60xyQ95A2gW1QDbzillgbDS7Obwlj+3iNJK3/Qbq0o2d4JmSQ7imigoy0mfz?=
=?us-ascii?Q?fL1ss6x9i4CuNxuAumAqGYbwE11xZsIJuKTUP95GYW7HuWqsIZHnUhf7tbA5?=
=?us-ascii?Q?Fz+uRpc3RGQGisksPIcF91Y/zpt/mi37muMKNuLGAxTcLldgqG9llP6uZOx8?=
=?us-ascii?Q?jdsFQI9HLg+KTrF34+6nvgogM+cfvYnyCSBiiPodi/e1Kz4CIGVN+sKbeSRp?=
=?us-ascii?Q?S0cs2Qm50k8aleWmlJyyir9vFMzUjboPo98P/92+ZSsMzhM27Tlsf7fh6lf+?=
=?us-ascii?Q?9Xq9cIo7+KJY5EXUKgHYPeru7kwUFToo?=
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:53:06.5390 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 425dc45c-9f7b-4b07-bc42-08dcbacdb628
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: SA2PEPF00003F67.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6288
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=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=fbb350108ffb8cc68c6bf96178f17d33fb7eaa3d
Thanks.
Xueming Li <xuemingl@nvidia.com>
---
>From fbb350108ffb8cc68c6bf96178f17d33fb7eaa3d Mon Sep 17 00:00:00 2001
From: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>
Date: Wed, 26 Jun 2024 15:48:18 +0530
Subject: [PATCH] crypto/cnxk: fix minimal input normalization
Cc: Xueming Li <xuemingl@nvidia.com>
[ upstream commit 42ebfb0380cfc5e7c82555648b2ce064a9f4a3ad ]
Fix modex to nomalize input only when MSW is zero.
Fixes: 5a3513caeb45 ("crypto/cnxk: add asymmetric session")
Signed-off-by: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>
---
drivers/crypto/cnxk/cnxk_ae.h | 30 +++++++++++++++++++++---------
1 file changed, 21 insertions(+), 9 deletions(-)
diff --git a/drivers/crypto/cnxk/cnxk_ae.h b/drivers/crypto/cnxk/cnxk_ae.h
index a843d6b5ef..ef9cb5eb91 100644
--- a/drivers/crypto/cnxk/cnxk_ae.h
+++ b/drivers/crypto/cnxk/cnxk_ae.h
@@ -49,13 +49,22 @@ struct cnxk_ae_sess {
};
static __rte_always_inline void
-cnxk_ae_modex_param_normalize(uint8_t **data, size_t *len)
+cnxk_ae_modex_param_normalize(uint8_t **data, size_t *len, size_t max)
{
+ uint8_t msw_len = *len % 8;
+ uint64_t msw_val = 0;
size_t i;
- /* Strip leading NUL bytes */
- for (i = 0; i < *len; i++) {
- if ((*data)[i] != 0)
+ if (*len <= 8)
+ return;
+
+ memcpy(&msw_val, *data, msw_len);
+ if (msw_val != 0)
+ return;
+
+ for (i = msw_len; i < *len && (*len - i) < max; i += 8) {
+ memcpy(&msw_val, &(*data)[i], 8);
+ if (msw_val != 0)
break;
}
*data += i;
@@ -72,8 +81,8 @@ cnxk_ae_fill_modex_params(struct cnxk_ae_sess *sess,
uint8_t *exp = xform->modex.exponent.data;
uint8_t *mod = xform->modex.modulus.data;
- cnxk_ae_modex_param_normalize(&mod, &mod_len);
- cnxk_ae_modex_param_normalize(&exp, &exp_len);
+ cnxk_ae_modex_param_normalize(&mod, &mod_len, SIZE_MAX);
+ cnxk_ae_modex_param_normalize(&exp, &exp_len, mod_len);
if (unlikely(exp_len == 0 || mod_len == 0))
return -EINVAL;
@@ -288,7 +297,7 @@ cnxk_ae_modex_prep(struct rte_crypto_op *op, struct roc_ae_buf_ptr *meta_buf,
struct rte_crypto_mod_op_param mod_op;
uint64_t total_key_len;
union cpt_inst_w4 w4;
- uint32_t base_len;
+ size_t base_len;
uint32_t dlen;
uint8_t *dptr;
@@ -296,8 +305,11 @@ cnxk_ae_modex_prep(struct rte_crypto_op *op, struct roc_ae_buf_ptr *meta_buf,
base_len = mod_op.base.length;
if (unlikely(base_len > mod_len)) {
- op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
- return -ENOTSUP;
+ cnxk_ae_modex_param_normalize(&mod_op.base.data, &base_len, mod_len);
+ if (base_len > mod_len) {
+ op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
+ return -ENOTSUP;
+ }
}
total_key_len = mod_len + exp_len;
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-08-12 20:44:03.280194139 +0800
+++ 0021-crypto-cnxk-fix-minimal-input-normalization.patch 2024-08-12 20:44:01.935069263 +0800
@@ -1 +1 @@
-From 42ebfb0380cfc5e7c82555648b2ce064a9f4a3ad Mon Sep 17 00:00:00 2001
+From fbb350108ffb8cc68c6bf96178f17d33fb7eaa3d Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl@nvidia.com>
+
+[ upstream commit 42ebfb0380cfc5e7c82555648b2ce064a9f4a3ad ]
@@ -9 +11,0 @@
-Cc: stable@dpdk.org