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 4F02A46532 for ; Tue, 8 Apr 2025 10:04:52 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 450AC4027F; Tue, 8 Apr 2025 10:04:52 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2070.outbound.protection.outlook.com [40.107.94.70]) by mails.dpdk.org (Postfix) with ESMTP id CFBDB4027F for ; Tue, 8 Apr 2025 10:04:49 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=doCIiTAWqWfiAwKUrzw6VQZoC097sbyUe1imjUw/P1Kun47reOOEWq+ELtWDWBT0CddOaBbyS6dD9t0lBC1lfCi6AxFvq+OqfzXG4uBjEDA11XvTEVUFC40mWy0PVBKdSaDVdo7I30RoZ3Lw0yXiuQ7YOI3kbM+UrOXkthA7w1MxvMZzmTS19iQaigzthhKd5FjUxuvjPR4A9nqma/DqnM82Hk2jDpJUS4zsZCUtYduIFeF2d0hdmcQVNZG5e7Eb6bt6oB355aS87AHsg43WBSHkWeqlhSx3jHC6pi12lA2wsX0H375Rx22z6STV8l/TRxUcp93VFFAGHH0fJ/MGWA== 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=FcFnm6EDHmf0qTiVXWFSC6VaSFoLWXa8oxXJOk8pfr8=; b=Gwg2Bi7Vu8ni1OORRNn0K/4dJOV8xFKGGFszUXJn6GAC8xhuzCcSWVQADmmJ8xMfRNH+7KYdVMZqgdLnm0HHBT09onPupGcwZMDd8EWPXcNC3dXMQiDwOwMHxkYLKAhdvwmcVLU/RWKJbFOejxUUSlB9qkPbfg18ehkrJoVahHmaKQMaDMtthSUZxWC1048Fj7Qppw6Ue8tNjpJcBlJdEpRyWIJDXog1nypSQq5ISqrydDv2Nk/UJ0iY4T+BTnXNAJfcBZ+ojNyb829LbO0hTs5wWJTKp1BnIQGblNe+t1DbVZ6nGNr6rzU8wlYYnc+ZJBHf1+nQuJVbOr4qe/90sA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=FcFnm6EDHmf0qTiVXWFSC6VaSFoLWXa8oxXJOk8pfr8=; b=LC4zvpcQe6At1PrqKRzyv5qPgD0JjLZF4aESkU6jI967XCJeuP60hYO8GesLoxFtRox5i5cx7oNQHoVc42ONuKTjndbPCD8ogdHA/VFizywCWvCnBvktEbIlcYkEAmzuu7U6iKJ/tzPjdFuJM85LIsFyq/RHhbq5JTQ7n1041mIX1x+IOTZH4AuijCi95VyE+5tIOn4l9ADVAPqmXuway9uwIuVbh9SnLZVOOZ04r+c8MQFmomsOK55T8o4pKm0VGzrxyPCJ42zPY9msJMQ9d0s2yS1GJ7wnXuO0hI0NCgPvFuByapAehLboKpXws84184yG/vF6puERYc/pUHf0aQ== Received: from PH2PEPF00003857.namprd17.prod.outlook.com (2603:10b6:518:1::79) by CH0PR12MB8579.namprd12.prod.outlook.com (2603:10b6:610:182::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.34; Tue, 8 Apr 2025 08:04:44 +0000 Received: from BY1PEPF0001AE17.namprd04.prod.outlook.com (2a01:111:f403:c902::16) by PH2PEPF00003857.outlook.office365.com (2603:1036:903:48::3) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8606.31 via Frontend Transport; Tue, 8 Apr 2025 08:04: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 BY1PEPF0001AE17.mail.protection.outlook.com (10.167.242.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.22 via Frontend Transport; Tue, 8 Apr 2025 08:04: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; Tue, 8 Apr 2025 01:04:31 -0700 Received: from nvidia.com (10.126.231.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; Tue, 8 Apr 2025 01:04:28 -0700 From: Xueming Li To: Arkadiusz Kusztal CC: Xueming Li , dpdk stable Subject: patch 'test/crypto: fix check for OOP header data' has been queued to stable release 23.11.4 Date: Tue, 8 Apr 2025 16:01:53 +0800 Message-ID: <20250408080214.371154-15-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250408080214.371154-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> <20250408080214.371154-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PEPF0001AE17:EE_|CH0PR12MB8579:EE_ X-MS-Office365-Filtering-Correlation-Id: a6446e15-b03c-4214-0305-08dd76740585 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|36860700013|1800799024|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?oatRaOiM7CwRn5vxanVhWDkBrjpB7KgqK5nUZ+oQRR/hmHTkaB4xiQKxOyjo?= =?us-ascii?Q?YK1Eb/dvVZH2Qb0jR4lRnwoUN/CDaVNVfL4q/IRvSNnzB3jr7ud40XMUCHJA?= =?us-ascii?Q?gkiuLQ+qVWf4p4W2y08x+J410KmkLI+/vDQHjiL/zdtIeEwvA1mWsTJgV4wt?= =?us-ascii?Q?ZbTvA1X9YFevSm3OgF/fTHDkMQeMGUEfmP+4Ssfu76k13M3x5LddLSt2qaaR?= =?us-ascii?Q?iFm3cWTdYBc4Z2i9p7i3OMhKIZ37p/JcrbMWGQrYTrBAKGxPZT+nDqECeofI?= =?us-ascii?Q?uRJVz3mJxtV/YWOk5PQa8VMYbWF8E525oGObV45uCeVJ4AN+wpMXemOMmk17?= =?us-ascii?Q?apkMsoxf1KzTmbD4bzJqJFaJFkMhWXLjCzkd5MJeyjdiBY5Wtk5A/NXfUt7J?= =?us-ascii?Q?4tEdRxlLfA27T2Mrzt3FevbipYwbJezLiQbiR4XLBTMyRDjkg1qHmUlvzZB/?= =?us-ascii?Q?YzfxrZJOoGRXJ5+9JjVZH4F9p1//Hdj1LUdz03IabHtetWJbUq+0tyqvo5ds?= =?us-ascii?Q?alecNmh1fK8uMfcbDkUzgv9dTYuAVHpcZsVFQZnc4tNGdA0yCTiIyx0tPsUh?= =?us-ascii?Q?CE3lutEzbrTO3kHCzt54yKlkCMmE2SODslaOMznSwtTgJ3qoXeYFtsGnKwrY?= =?us-ascii?Q?FONa4M053cDrmjJFiU/FEY5jpH6wmR2r9tFmPBoJXym4MDwRecGbv6uAkxVD?= =?us-ascii?Q?EREAq3reuJd/ypUB6CYYHGi3emDf2sxZ6qfrmQTbCwtnDpgxJs8SRZkzB60a?= =?us-ascii?Q?Gm+8q0fb8LZt/bHpUoTC8cSURfB4EC4kuQi4wrTLvdB1H1dlRscaMxtdvOF6?= =?us-ascii?Q?XclVTC9BtXzJWQ1myDuwTvnVe9+cGJjYcM+VOPhQfJ0ay2tfBz6S2uLj67jF?= =?us-ascii?Q?ljucunSrpxt2Y+eJSU8K+9PF0Sh+IYD1H0N/orKfhzEpG2qLxVBqnV+Cj2dy?= =?us-ascii?Q?9pQxU+dCt7C/tPFtXcbP8lTTQrzA3A4XSoPAqtgu/zEUrVMn5ig2TWjpL+Wh?= =?us-ascii?Q?FiaZmr70Mwwk7DIUDW2Ippk9wziwtlmYMPi+DfQm/H7n3Vp5XsK0cAN+g8aK?= =?us-ascii?Q?AoJ6g1kyWip2teD74812lDgNOLU9S2JJfTQgjvmotCbgflJxbOZiQViD6Z5d?= =?us-ascii?Q?NNvHI3Oz/aZAS+8H5UIqtL05wwe9rYaYchhUVOfBf6G7F7TkK+HwYHpRfCkE?= =?us-ascii?Q?GYhoyegsNGEZEfXzeQBzmEu6+5X6OnbMxZsfdyTWKQ8JY1EEnLHUaRMfaS1N?= =?us-ascii?Q?qAG7hCRt7bDrZVa3zY7Lt1FHyx2BDavf1S5WpRkSLoe9UixNVAArlnlQBQ+J?= =?us-ascii?Q?jTugDs20qqjNA90dUmPFUEHZebTtCqPToSAbhMWExn9Z2qsYgNhSK7+3EWt/?= =?us-ascii?Q?VfHIG09aojipFjiAQmtASD+UH/b4PfBH0xfvv1vDvyFDHcS+I2ARrnKXexWG?= =?us-ascii?Q?TLDPAqHH7uLgtVr8dmBVW/jD+ArPMWHTpZi90veMuZdy1Nz87cGJCo+3xLcv?= =?us-ascii?Q?fvx88N0roDMrygo=3D?= 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)(376014)(82310400026)(36860700013)(1800799024)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2025 08:04:43.7209 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a6446e15-b03c-4214-0305-08dd76740585 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: BY1PEPF0001AE17.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB8579 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/10/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=923c56406f200d77e6fb969b4b23b4010096b766 Thanks. Xueming Li --- >From 923c56406f200d77e6fb969b4b23b4010096b766 Mon Sep 17 00:00:00 2001 From: Arkadiusz Kusztal Date: Wed, 26 Feb 2025 08:16:45 +0000 Subject: [PATCH] test/crypto: fix check for OOP header data Cc: Xueming Li [ upstream commit 27eb74ea6e25966d3857539cb15ddd4f20f05ebe ] The data of the out-of-place header is never checked. Therefore, the faulty PMD, which overwrites this data, will not be able to verify that with tests. New checks to support that were added to the GCM OOP functions. Fixes: 51e202f0596f ("test/crypto: rename GCM test code") Signed-off-by: Arkadiusz Kusztal --- app/test/test_cryptodev.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 7d9fe29c02..48306266ba 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -12473,6 +12473,8 @@ test_authenticated_encryption_sessionless( struct crypto_testsuite_params *ts_params = &testsuite_params; struct crypto_unittest_params *ut_params = &unittest_params; + uint32_t i; + uint8_t *buffer_oop; int retval; uint8_t *ciphertext, *auth_tag; uint16_t plaintext_pad_len; @@ -12542,6 +12544,18 @@ test_authenticated_encryption_sessionless( ut_params->op->sym->cipher.data.offset); auth_tag = ciphertext + plaintext_pad_len; + /* Check if the data within the offset range is not overwritten in the OOP */ + buffer_oop = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *); + for (i = 0; i < ut_params->op->sym->cipher.data.offset; i++) { + if (buffer_oop[i]) { + RTE_LOG(ERR, USER1, + "Incorrect value of the output buffer header\n"); + debug_hexdump(stdout, "Incorrect value:", buffer_oop, + ut_params->op->sym->cipher.data.offset); + return TEST_FAILED; + } + } + debug_hexdump(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len); debug_hexdump(stdout, "auth tag:", auth_tag, tdata->auth_tag.len); @@ -12576,6 +12590,8 @@ test_authenticated_decryption_sessionless( struct crypto_testsuite_params *ts_params = &testsuite_params; struct crypto_unittest_params *ut_params = &unittest_params; + uint32_t i; + uint8_t *buffer_oop; int retval; uint8_t *plaintext; uint8_t key[tdata->key.len + 1]; @@ -12656,6 +12672,17 @@ test_authenticated_decryption_sessionless( debug_hexdump(stdout, "plaintext:", plaintext, tdata->ciphertext.len); + /* Check if the data within the offset range is not overwritten in the OOP */ + buffer_oop = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *); + for (i = 0; i < ut_params->op->sym->cipher.data.offset; i++) { + if (buffer_oop[i]) { + RTE_LOG(ERR, USER1, + "Incorrect value of the output buffer header\n"); + debug_hexdump(stdout, "Incorrect value:", buffer_oop, + ut_params->op->sym->cipher.data.offset); + return TEST_FAILED; + } + } /* Validate obuf */ TEST_ASSERT_BUFFERS_ARE_EQUAL( plaintext, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-04-08 15:39:06.811698895 +0800 +++ 0029-test-crypto-fix-check-for-OOP-header-data.patch 2025-04-08 15:39:05.956436571 +0800 @@ -1 +1 @@ -From 27eb74ea6e25966d3857539cb15ddd4f20f05ebe Mon Sep 17 00:00:00 2001 +From 923c56406f200d77e6fb969b4b23b4010096b766 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 27eb74ea6e25966d3857539cb15ddd4f20f05ebe ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -16,2 +18,2 @@ - app/test/test_cryptodev.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) + app/test/test_cryptodev.c | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) @@ -20 +22 @@ -index 2e58819fca..bbab034c5f 100644 +index 7d9fe29c02..48306266ba 100644 @@ -23 +25 @@ -@@ -13798,8 +13798,9 @@ test_authenticated_encryption_oop(const struct aead_test_data *tdata) +@@ -12473,6 +12473,8 @@ test_authenticated_encryption_sessionless( @@ -27,0 +30 @@ ++ uint8_t *buffer_oop; @@ -29,2 +32 @@ -- uint8_t *ciphertext, *auth_tag; -+ uint8_t *ciphertext, *auth_tag, *buffer_oop; + uint8_t *ciphertext, *auth_tag; @@ -32,3 +34 @@ - struct rte_cryptodev_info dev_info; - -@@ -13875,6 +13876,18 @@ test_authenticated_encryption_oop(const struct aead_test_data *tdata) +@@ -12542,6 +12544,18 @@ test_authenticated_encryption_sessionless( @@ -53 +53 @@ -@@ -13907,8 +13920,9 @@ test_authenticated_decryption_oop(const struct aead_test_data *tdata) +@@ -12576,6 +12590,8 @@ test_authenticated_decryption_sessionless( @@ -57,0 +58 @@ ++ uint8_t *buffer_oop; @@ -59,6 +60,3 @@ -- uint8_t *plaintext; -+ uint8_t *plaintext, *buffer_oop; - struct rte_cryptodev_info dev_info; - - rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info); -@@ -13986,6 +14000,17 @@ test_authenticated_decryption_oop(const struct aead_test_data *tdata) + uint8_t *plaintext; + uint8_t key[tdata->key.len + 1]; +@@ -12656,6 +12672,17 @@ test_authenticated_decryption_sessionless(