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 D49A345E41 for ; Sat, 7 Dec 2024 09:10:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CE25840281; Sat, 7 Dec 2024 09:10:01 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2071.outbound.protection.outlook.com [40.107.92.71]) by mails.dpdk.org (Postfix) with ESMTP id 38F8140281 for ; Sat, 7 Dec 2024 09:10:00 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oG/LKBsZI4xP46y4PWSlJFR2mwMmdqQxpw/9Ock8fyyz7l3v9SGZtO8gIVyy945es5MmkvO1wDexzsifpgbRS+CwTnGUKmsWJHqJV1SAaLbhlHjhX45dHqmSBtPMaSMS4AQXV06GZguNZqMNq8YYhfSWib6koVHFc/KmnPXjCYAPDizFVVq2nRn5mRd0WZPcSYYSMKBmq2ehzqjRxd1fo14aO3tthhZNDuYZFwGMqMTv/VrTr8sUg5NH8/2Zd4NHnk7BbiWawJ648QCXTcBQmVGWvXzjiCHQX3AsQZWZ59i9lVcJjcLgeZ8v+EWwmEDi53AM2Rh1gVGtGh+su2xJ9Q== 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=k4q4WrLOBubhv+Lc7bbyMxQ9D/nVfkKe9YyfVjGJP0k=; b=o1e3SAd5f2/JDVcm93paznvfMctND9VntKmENdR5TwWgyTxjRHz+SPtxjwKSPIYFvO9BZ/bC+VQUVvlMBMhgBjPk6uRJck9NPVpI64ltxtDBM0+r6cda9KUOSrx3Pmwg0+oPqVYjtLsJ2sGGgHLvYFzAw/DoLEDOna+uamfnUjhk9aa1Y5aCinMXw2FbzXX0npgb8j179LboqsbJgdrAbuhLjR9ypMXmQFye+4oZaZh/YaCwFvmY4/0+fcGW6SGEWwEM3zrAtSDm1/R3xYyKGfcIv/YGtRUWNgrragFo6UjbOnLOMhHI51zVELvY94fLLjliAs0eOOTDG1811xLqlQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=networkplumber.org 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=k4q4WrLOBubhv+Lc7bbyMxQ9D/nVfkKe9YyfVjGJP0k=; b=d6cyqCNj+Bfnr3/j5hqXwrfsuafRkAIWq4FbwwhiHN1ZSJb79RxtxadaXssqOf4BCOH5PGKzYG04lWwdASvkPITyAkiHeiy2jD4BYK900a7HE3jK9vu522i82/7JtKnqfeX4mR/L0T5wzVdm9JiMd+1j3jiO//82WG3Y4kKWlhZFvXOKHl2GEsHvdno0P7qfY9GGjUaaftr0dH+Y+d3jrbyb9jRu8Z8J80ZqGZFIQcxBImEfZgpaG0n0c+T3v6unM+n48DVN+hH0PtKHnFZUa8DuiQFI558qDNM2D0/opQpckPAmz1dwFwFDMx43msS0qZS/iawH7nl50+0D1HIzjw== Received: from MN2PR15CA0002.namprd15.prod.outlook.com (2603:10b6:208:1b4::15) by IA1PR12MB6284.namprd12.prod.outlook.com (2603:10b6:208:3e4::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.23; Sat, 7 Dec 2024 08:09:56 +0000 Received: from BL02EPF00021F6E.namprd02.prod.outlook.com (2603:10b6:208:1b4:cafe::36) by MN2PR15CA0002.outlook.office365.com (2603:10b6:208:1b4::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8230.12 via Frontend Transport; Sat, 7 Dec 2024 08:09:56 +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 BL02EPF00021F6E.mail.protection.outlook.com (10.167.249.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Sat, 7 Dec 2024 08:09:56 +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; Sat, 7 Dec 2024 00:09:43 -0800 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.4; Sat, 7 Dec 2024 00:09:41 -0800 From: Xueming Li To: Stephen Hemminger CC: Xueming Li , Bruce Richardson , Chengwen Feng , "dpdk stable" Subject: patch 'test/security: fix IPv6 extension loop' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 16:00:48 +0800 Message-ID: <20241207080055.488538-91-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241207080055.488538-1-xuemingl@nvidia.com> References: <20241111062847.216344-122-xuemingl@nvidia.com> <20241207080055.488538-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: 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: BL02EPF00021F6E:EE_|IA1PR12MB6284:EE_ X-MS-Office365-Filtering-Correlation-Id: f2befecf-cc33-4ff8-1c57-08dd16968989 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|82310400026|36860700013|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?9dKsmk/P0lXzuhW4s54tVgyZUMgr4PSVyV98+qklSKcZ5KYW4RYLTsg3Qn8n?= =?us-ascii?Q?ii6SNeJZ2YZmlvqrCqeiBlKsAB5r/nw0vPDYO0/MicEElznCPqoYpyoNs5ll?= =?us-ascii?Q?LxKklNIR17NApEV0ljn4fEVWEQ9ghzJ27sB8ZFDdo1vJwYUUIa3gEZPoIBde?= =?us-ascii?Q?KWYzUVymg4T6uQhqrv8D0Xrh9NZChywPzCTfYDRUitublPtELpUXTCvfsDP3?= =?us-ascii?Q?7Wla5jXE5wijUAtdCubwG0twSuk8mDuqpT8lAvaOmKkLqyPRKWLPWSS2b6k/?= =?us-ascii?Q?/7h5R/ADj7+KjUgJoZqqYWGpW676HQxFSJNT8Fdq7vPCSGDf6hKl/uSwtizX?= =?us-ascii?Q?JCEpDCA4nNaGcpZf2xj4n7JYyuiZKQdt8TJMfpaI9+TMTrmM8VIoRUzQboQV?= =?us-ascii?Q?qJTcwUDX5FLtTIB4FS2j2hh+pZ7h7fIZs2s+JvgkJHqzsy+I+UbeBIz/vKJa?= =?us-ascii?Q?oTfy1wrbVaPsapBbP8sIUm1/m+TtH0OnzedsPqmqNv1hVQzhiKROQLjhKzLT?= =?us-ascii?Q?E67SOrKgo9T86BIEM++w5t5Mjuw6CkWSgKx4LYxX20IGDimhEuiHgAot/Ekw?= =?us-ascii?Q?gIjqGFxHxKfLkyDvWVI49zp3CyPGtuYcSGCn6bSov9mUMkqg1c6fX5SHpFZm?= =?us-ascii?Q?F2THTFr/RSQba81Hh8mS35s18EuKNzsU41aLZeFtKqUPh+rmdAVsDu3GqqG9?= =?us-ascii?Q?y1fn49wARwIwl/8XmN11NmkQ9HOgbFZ4q+LOUSuAsRg1M9ouOcYgX/PLsJhs?= =?us-ascii?Q?5xdyQKJQQHKdHCHaItAWwIjXefFJQPCMUuJYLgeG+hJYbbx6VoxQ8GXus+g+?= =?us-ascii?Q?NtlsFY0Va6RJIk7+d3xLoDSquDHG9Oae//n19ZH0yMC/s4Sgv7w+SyNMzgks?= =?us-ascii?Q?exG2kv3bZTcHGGQnfNeATvXkZgOMgTxc/yRLEf9ZCbTAA+ckc4MNH+Bj8HcX?= =?us-ascii?Q?uCTeI4Qs3g0STbfUzzO3BWQSHwX6+678LxR/Y5XfIiSGZ8HvpXoOe12kuM7n?= =?us-ascii?Q?OQi//ixGgt/TSARxEB8Sh4lpl3EdvEGT3w+nQtDEPXSEqq+seykWHMKZSxtd?= =?us-ascii?Q?jjakIP3rG8PRlC2YRX0ntkLaNAGLdVPaOKMk1ixjI2YF3/kJHkUEDXg2OCQ4?= =?us-ascii?Q?FJbpNQKHCGKY81eNJ/m+8ydWt94T+gbbS5j9cNEM7pQkX8MjaP9eMF+uyPjw?= =?us-ascii?Q?wVZ0/num5bbf2d+EWn6h5lxrVYAISkHmKaDQDYdtLjgHlxRyrI2mHYxYTAKr?= =?us-ascii?Q?av5ZI9wZfbjbBsmQ4qCVBBIlN2ZoNxaTnDegrpmCPYR7pflPeC21h+KB/+OV?= =?us-ascii?Q?vaOu/uuXzI3y+OwZeSWvFTW3XzP0rBaxeB7jjsq8hR5bJkle0dmcY5weOi63?= =?us-ascii?Q?oER2+V9X8teRrt8mKJx/YT1N7Z314cWnqbEJLWWH8dNQiF9YXbdJJzeBE8wo?= =?us-ascii?Q?sPUTqFv2FWqaA2tqWIQR9ogPm1Qmr0fb?= 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)(1800799024)(82310400026)(36860700013)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:09:56.2973 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f2befecf-cc33-4ff8-1c57-08dd16968989 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: BL02EPF00021F6E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6284 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/10/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=4227ec424b9bfa85301d65bfc0928ea9c903e597 Thanks. Xueming Li --- >From 4227ec424b9bfa85301d65bfc0928ea9c903e597 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 21 Nov 2024 10:23:24 -0800 Subject: [PATCH] test/security: fix IPv6 extension loop Cc: Xueming Li [ upstream commit 0151b80786ebbc62f0ead73bd4708665228a093d ] The parenthesis were in the wrong place so that comparison took precedence over assignment in handling IPv6 extension headers. Break up the loop condition to avoid the problem. Link: https://pvs-studio.com/en/blog/posts/cpp/1179/ Fixes: 15ccc647526e ("test/security: test inline reassembly with multi-segment") Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson Acked-by: Chengwen Feng --- app/test/test_security_inline_proto_vectors.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/test/test_security_inline_proto_vectors.h b/app/test/test_security_inline_proto_vectors.h index 3ac75588a3..0b4093d19a 100644 --- a/app/test/test_security_inline_proto_vectors.h +++ b/app/test/test_security_inline_proto_vectors.h @@ -498,10 +498,12 @@ test_vector_payload_populate(struct ip_reassembly_test_packet *pkt, if (extra_data_sum) { proto = hdr->proto; p += sizeof(struct rte_ipv6_hdr); - while (proto != IPPROTO_FRAGMENT && - (proto = rte_ipv6_get_next_ext(p, proto, &ext_len) >= 0)) + while (proto != IPPROTO_FRAGMENT) { + proto = rte_ipv6_get_next_ext(p, proto, &ext_len); + if (proto < 0) + break; p += ext_len; - + } /* Found fragment header, update the frag offset */ if (proto == IPPROTO_FRAGMENT) { frag_ext = (struct rte_ipv6_fragment_ext *)p; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-12-06 23:26:47.070377807 +0800 +++ 0090-test-security-fix-IPv6-extension-loop.patch 2024-12-06 23:26:44.103044826 +0800 @@ -1 +1 @@ -From 0151b80786ebbc62f0ead73bd4708665228a093d Mon Sep 17 00:00:00 2001 +From 4227ec424b9bfa85301d65bfc0928ea9c903e597 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 0151b80786ebbc62f0ead73bd4708665228a093d ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index b3d724bac6..86dfa54777 100644 +index 3ac75588a3..0b4093d19a 100644 @@ -25 +27 @@ -@@ -519,10 +519,12 @@ test_vector_payload_populate(struct ip_reassembly_test_packet *pkt, +@@ -498,10 +498,12 @@ test_vector_payload_populate(struct ip_reassembly_test_packet *pkt,