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 A79F046A63 for ; Thu, 26 Jun 2025 14:08:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A169F400D6; Thu, 26 Jun 2025 14:08:12 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2055.outbound.protection.outlook.com [40.107.236.55]) by mails.dpdk.org (Postfix) with ESMTP id 711C1400D6 for ; Thu, 26 Jun 2025 14:08:11 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=A5wgYM5a7ld442D5FTMzwUA4LYmAaUybU15oFwAN7TjerBvXbC//U8F4E77+KtszQPK7Og3aWAAtqZhDBX1FayNlIeWWamJi3bqLJMe/TVtzpJ2FZoxo+/Ti8hc8KecICUtYN28og3mXOSDMOj/c+384LO8ZkY883RyaChoGhm+/vltBcOkThQI+Itwml06wly3vsqKSr2E1mifc54Va9KhO4JorZ67zK3/tKDwVm/QXomnkJ1SM8mlzrcgVPGX98o6wrth+O792Fv7gcxvW2wFDMIbQkbrYmmiQgLFO5fG7wTmUyu97RsTxHi3t7jq7duXySSQKaLxiDun+pdL2hA== 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=ISKfF7c30A+IRtuFNYr0gJaDkCI3TPycA9erIJzmV8M=; b=sZOnGHum/GRxsycneF+Mh7ehz62JzPev5V2SrkZMO+Lw4NzaW2vr6pNeP42MITh7vVhswbb4qcNLOaFL14XXqPudpJnCYKjNboMvCRP5z5JsL68kcQ0uol1AkY7kcZ9XYr33vvQeiuUSTmjW3EisxcVazqiuX0SjQ+hhFXPf/PoYOKJznG9OAlmDh5Ig90Ji9PMll4DfW24PtT6g71d8XBT1s50fUc10ivVLaJXlZhLCK7MiwepRbIjI9bGGVOp/AHmds5xLd+g1RI8s1wFsSGZcNUa1mMY0rqGpAyS08t9Rh3GnByHAtTuOHlzkntBjod1XRKBz4mk+QiP2gcemEg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.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=ISKfF7c30A+IRtuFNYr0gJaDkCI3TPycA9erIJzmV8M=; b=MOvu1IITSeqrCcdlBYigS2L3CT3QZuaA5dpyuUnE7xnyjxKzf6KKh0xH3M0qe93QWiLaaaJjuS/UGZWASVQ0iUef4bs9m9lZCQuALKR8o9M357y/CkS5zZq1MW4rQrvAmpw0Pl5yBkc0ndv4LyYDiN1N9QQfq7GNmYPocaBgb4C+GeVG0uBpMVzTvZ/ZIRzITvygoCPoqgqM4aeI7gy/uOJ8PCOyoWUZNjYsPRqEGmsk5k+2LpwMb2SLVh3YnBQiHerBd9GQVrrPcBTInyJ5L/Ohl0eDVPqQjf+Mgdn5FJoGrbELXTVsB1xdUlnATLHeJlOdvD6fyhGyxyiTUbUZNA== Received: from MW4PR03CA0101.namprd03.prod.outlook.com (2603:10b6:303:b7::16) by SJ2PR12MB8652.namprd12.prod.outlook.com (2603:10b6:a03:53a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.21; Thu, 26 Jun 2025 12:08:08 +0000 Received: from SJ5PEPF000001D1.namprd05.prod.outlook.com (2603:10b6:303:b7:cafe::a1) by MW4PR03CA0101.outlook.office365.com (2603:10b6:303:b7::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.21 via Frontend Transport; Thu, 26 Jun 2025 12:08:07 +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 SJ5PEPF000001D1.mail.protection.outlook.com (10.167.242.53) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:08:07 +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; Thu, 26 Jun 2025 05:07:54 -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.14; Thu, 26 Jun 2025 05:07:52 -0700 From: Xueming Li To: Radu Nicolau CC: Xueming Li , Fan Zhang , "Yu Jiang" , dpdk stable Subject: patch 'crypto/virtio: add request check on request side' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:01:27 +0800 Message-ID: <20250626120145.27369-68-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-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: SJ5PEPF000001D1:EE_|SJ2PR12MB8652:EE_ X-MS-Office365-Filtering-Correlation-Id: c1a2f74d-2b8a-4ed2-9325-08ddb4aa1cdb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|1800799024|36860700013|376014|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?pB239T+gQtW17xWv7cHnaVSN3ybNr+4phRa+5TlwMjjlPpHVHKqzmNAd7o9I?= =?us-ascii?Q?6KinoT15y/kKZnX5Oy0S82sMwHjE+8Epf+8poK5iGaftenNE9m+z7Ftf6ag8?= =?us-ascii?Q?7u36QCFIXgEAONoUeQXPdyq2DOWj3IgOMGh9HtnST+SSen8/6Ub7CPuXLec0?= =?us-ascii?Q?XzoA73iia4OOO/Itu+WMKhcg4H/nVaZyOmVAsSbiskp0iaatecpOpUbf8FLM?= =?us-ascii?Q?jeqAyVCeeT7wPbJlx0sVNdKcubf7MWE2hddljf/KPt1PRqz8u69dojRaaV+V?= =?us-ascii?Q?vO7L9/pint6G9jEoeU5iXDWIi8YfuHSvqofy7juOjqFp5yq1b2reAklOCNHU?= =?us-ascii?Q?DYGdTYYnZ6VxbnHFLOcB93BHr3zmcFkke1+ih942ZhVcF/bdHiBbMgfEDB4D?= =?us-ascii?Q?UzH42shfcbDH3k7DkWN07XsnUt8gh1rt21MxWY/2Lrh22hbwORjMDMwWIgV/?= =?us-ascii?Q?tL7pkrPZUqrzo3H2nIyw4HRbkMCW3p/duzlia6RHBsuUR4pw6t1m/VwbbSVW?= =?us-ascii?Q?jSjn7B476y3GgXbzX01LtG2P2KOVgboM4e9lhWHewU8JVv+Oyug/0zkFlWEa?= =?us-ascii?Q?G5P3t/K4yZqplPmiVcJNTTNtbYg5E0v2/cnj+OzrDHLyHVGP7irJ6djUy8ni?= =?us-ascii?Q?iqKoSSobD2nki7JxZi4bIbXH9iU2xr4hQjt7A6dYhznUZZaTBzzuf+2PGKxO?= =?us-ascii?Q?E2DRkSGMc/YICDZfle2AGG92TYfrfIIdX5YfqjjLetaxoAW80y7DQuDaR2yT?= =?us-ascii?Q?RlXOIVi0sMfPTuNNaowHqvwbWQaq/koQuUZisBGWb3p30zbiyrXK2A5yiGcm?= =?us-ascii?Q?WrzJMNOXxV+D+WG6uf1BLU/HZg8bqt1tpdwcrdeCVXNKy2Wn68apT6UWoOEs?= =?us-ascii?Q?Ldgx2zcd6FbRLoxZ+SMJPOIu02xEsp9lSzOgqYm3El4gsK1AYxdSJAkL64dx?= =?us-ascii?Q?7V0nIYlMxzXV03c/B6exqTljnLzawEV8+E9rCy8WwxwwYl6WzEDHoLWRbohw?= =?us-ascii?Q?l0IQm3OPhvONKWlULi+YuWuM3Phv7cm4MmpK/bMgPO8Oa10CtXldja9CZmiO?= =?us-ascii?Q?867/Q4NSMcziBrC09vM/LXcXOjvOOATW63FqI81O2wAG5QjQUu3646Q/hNfK?= =?us-ascii?Q?iQwAQT/y77DkdDWdVzbcoyga+zX2PIaq4taOjQCBJ0pLlFWRvbOUO0EqN6pG?= =?us-ascii?Q?aQojoAbm5Dn9NUnUYQ7nCYjZD+7KtXSPHlHxfVA+YFCOYLANTyIEsNGY7uZF?= =?us-ascii?Q?4Jk9vcvM0Onm0G9FWeCdubrwH9sxcIjbTrWQvWuAmtYPPHFXfCW0hrfTNdW8?= =?us-ascii?Q?9njmw9hj4niLr5GoZbcjyU5jE8JJ9LH4LLLjMdENHcWUr7pEfUtxPAEH4X/F?= =?us-ascii?Q?4l2DRmjS689uNNlo1J/dUP0dlzBUic9HPZ17y8UhcvZvlFNiVjbyjQFQJKYe?= =?us-ascii?Q?7vK2p+9vY9EqVQ9PZr79DJ9+rmxNht7mwIzdBP79EB6k5PAu4mAXuJA2YCg1?= =?us-ascii?Q?QCGf+AkWSLDisqabDuv8FLxSh6QRHRoB6meRQUxeL4UuwqFzvDbZGnP2SA?= =?us-ascii?Q?=3D=3D?= 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)(82310400026)(1800799024)(36860700013)(376014)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:08:07.7783 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c1a2f74d-2b8a-4ed2-9325-08ddb4aa1cdb 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: SJ5PEPF000001D1.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8652 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/28/25. 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=1356ebb2564d202abc4d80a33fc601bef7674432 Thanks. Xueming Li --- >From 1356ebb2564d202abc4d80a33fc601bef7674432 Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Fri, 23 May 2025 14:04:50 +0000 Subject: [PATCH] crypto/virtio: add request check on request side Cc: Xueming Li [ upstream commit 9771f037ec8c6592126be49ca50953d1a14a0335 ] Add same request checks on the request side. Fixes: b2866f473369 ("vhost/crypto: fix missed request check for copy mode") Signed-off-by: Radu Nicolau Acked-by: Fan Zhang Tested-by: Yu Jiang --- drivers/crypto/virtio/virtio_rxtx.c | 40 +++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/drivers/crypto/virtio/virtio_rxtx.c b/drivers/crypto/virtio/virtio_rxtx.c index 01977c7ec4..d645e757f5 100644 --- a/drivers/crypto/virtio/virtio_rxtx.c +++ b/drivers/crypto/virtio/virtio_rxtx.c @@ -107,6 +107,40 @@ virtqueue_dequeue_burst_rx(struct virtqueue *vq, return i; } +static __rte_always_inline uint8_t +virtqueue_crypto_check_cipher_request(struct virtio_crypto_cipher_data_req *req) +{ + if (likely((req->para.iv_len <= VIRTIO_CRYPTO_MAX_IV_SIZE) && + (req->para.src_data_len <= RTE_MBUF_DEFAULT_BUF_SIZE) && + (req->para.dst_data_len >= req->para.src_data_len) && + (req->para.dst_data_len <= RTE_MBUF_DEFAULT_BUF_SIZE))) + return VIRTIO_CRYPTO_OK; + return VIRTIO_CRYPTO_BADMSG; +} + +static __rte_always_inline uint8_t +virtqueue_crypto_check_chain_request(struct virtio_crypto_alg_chain_data_req *req) +{ + if (likely((req->para.iv_len <= VIRTIO_CRYPTO_MAX_IV_SIZE) && + (req->para.src_data_len <= RTE_MBUF_DEFAULT_BUF_SIZE) && + (req->para.dst_data_len >= req->para.src_data_len) && + (req->para.dst_data_len <= RTE_MBUF_DEFAULT_BUF_SIZE) && + (req->para.cipher_start_src_offset < + RTE_MBUF_DEFAULT_BUF_SIZE) && + (req->para.len_to_cipher <= RTE_MBUF_DEFAULT_BUF_SIZE) && + (req->para.hash_start_src_offset < + RTE_MBUF_DEFAULT_BUF_SIZE) && + (req->para.len_to_hash <= RTE_MBUF_DEFAULT_BUF_SIZE) && + (req->para.cipher_start_src_offset + req->para.len_to_cipher <= + req->para.src_data_len) && + (req->para.hash_start_src_offset + req->para.len_to_hash <= + req->para.src_data_len) && + (req->para.dst_data_len + req->para.hash_result_len <= + RTE_MBUF_DEFAULT_BUF_SIZE))) + return VIRTIO_CRYPTO_OK; + return VIRTIO_CRYPTO_BADMSG; +} + static int virtqueue_crypto_sym_pkt_header_arrange( struct rte_crypto_op *cop, @@ -142,6 +176,9 @@ virtqueue_crypto_sym_pkt_header_arrange( sym_op->cipher.data.offset); req_data->u.sym_req.u.cipher.para.dst_data_len = req_data->u.sym_req.u.cipher.para.src_data_len; + if (virtqueue_crypto_check_cipher_request( + &req_data->u.sym_req.u.cipher) != VIRTIO_CRYPTO_OK) + return -1; break; case VIRTIO_CRYPTO_SYM_OP_ALGORITHM_CHAINING: req_data->u.sym_req.op_type = @@ -181,6 +218,9 @@ virtqueue_crypto_sym_pkt_header_arrange( VIRTIO_CRYPTO_SYM_HASH_MODE_AUTH) req_data->u.sym_req.u.chain.para.hash_result_len = chain_para->u.mac_param.hash_result_len; + if (virtqueue_crypto_check_chain_request( + &req_data->u.sym_req.u.chain) != VIRTIO_CRYPTO_OK) + return -1; break; default: return -1; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:20.302178122 +0800 +++ 0067-crypto-virtio-add-request-check-on-request-side.patch 2025-06-26 19:59:17.466418041 +0800 @@ -1 +1 @@ -From 9771f037ec8c6592126be49ca50953d1a14a0335 Mon Sep 17 00:00:00 2001 +From 1356ebb2564d202abc4d80a33fc601bef7674432 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9771f037ec8c6592126be49ca50953d1a14a0335 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index a7f1bd9753..00988e18b1 100644 +index 01977c7ec4..d645e757f5 100644 @@ -22 +24 @@ -@@ -193,6 +193,40 @@ virtqueue_dequeue_burst_rx_packed(struct virtqueue *vq, +@@ -107,6 +107,40 @@ virtqueue_dequeue_burst_rx(struct virtqueue *vq, @@ -60 +62 @@ - static inline int + static int @@ -63 +65 @@ -@@ -228,6 +262,9 @@ virtqueue_crypto_sym_pkt_header_arrange( +@@ -142,6 +176,9 @@ virtqueue_crypto_sym_pkt_header_arrange( @@ -73 +75 @@ -@@ -267,6 +304,9 @@ virtqueue_crypto_sym_pkt_header_arrange( +@@ -181,6 +218,9 @@ virtqueue_crypto_sym_pkt_header_arrange(