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 5D6C2470E5 for ; Thu, 25 Dec 2025 10:24:59 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 534184068A; Thu, 25 Dec 2025 10:24:59 +0100 (CET) Received: from MW6PR02CU001.outbound.protection.outlook.com (mail-westus2azon11012024.outbound.protection.outlook.com [52.101.48.24]) by mails.dpdk.org (Postfix) with ESMTP id 2DDEA40647 for ; Thu, 25 Dec 2025 10:24:57 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mSVEMY+6HUEN6R2cZneWzxnY7lQ1SHzk3+Glyao43desAd3Bbfhdo1h4ozc88SyRMJe5gw+uU3Md+azWWr/ggTOwensjvx8AmEF5lK/1tocBFkguvKP4AWoN4YKuiuRqzgkoLVWeIIL3t3vcyYfXUKokTE7KXuLKbpaAOwRaEvJ+YnBAea3rpzNWzDv9kK1bWx2qnL5Igx+LFmVo5ccz255PVYi+iXkopJyd0s73YsTiEyfMRSaKy754OVZ0JVHm/lCKD1Tqj9hkuKgjqr8m/ABAkN/HNjrm8YZeyR5weaaOzYLBdMAo+TC+yJhVAA8VP5BK7QnAE/H8mIy40uTw4Q== 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=4JIM0EtBiVkDBMJ4jtmUNx1RU/jA6zPDis3m00Ktl4I=; b=d89HshVvxo3cgR1aD4XtkCYf7IohvJLHervbEzhIuo5NGnx+rELd53d94bMEY0YdwRnTe1c4z8kyVE26OXtFO7+VagwiSeOCz5CcQAjzoTgoVW3NDnRbGS1/871nqmLr3jo3GjexHR2iX3j09liU7Cw6v7EzdNk/Qr+GfEbJEiJ9IDkvtDnddAWhurb+qEuwgt8p+QQHhzri6zTuY5FvVQUOdkoLBErL9jPFh8wu/V4FQ1egQpoScMqqvwYB2bbKbh1ZMtKnwARSNouGTZo9wMF4u2RuHVmS1/wvniVp8zMQ+cKEKqZDo1/rJq5HTb/1tV+vR7X/R9zgHAS8i9I9XA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.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=4JIM0EtBiVkDBMJ4jtmUNx1RU/jA6zPDis3m00Ktl4I=; b=uEhIzVF/h9FtRXzw7X5kqqyPF33Ag27ew+3T9hcKHE8M+xhdyytS28ueM+ma1XQfEY9VIj1ao3XNTS816CVmf2HMIcjdHaqucLJgBBC6jWk/A8+88bWyHdigu6gxrazuWYWy0ZGCogXJ7MeRnuIevFIHui+LtZCS8uJaNr8O9+BVYfvQF5+H6ud5bfwINKsfOBxqhatCy1XK4T9xvyjsrnNobUCTc8FiBIxW2mrERjuwWUPXJ5sswbFpN4jMNaBwAG+AHuhGKFAEk0JvPnXhohsp/DPa9N7n0Ahg/cAXpkS9TP3duE2w/srZjRhBebFEQwgLubobELkP0ICMJ7W3+Q== Received: from CH2PR19CA0002.namprd19.prod.outlook.com (2603:10b6:610:4d::12) by SJ2PR12MB8979.namprd12.prod.outlook.com (2603:10b6:a03:548::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.11; Thu, 25 Dec 2025 09:24:52 +0000 Received: from CH2PEPF0000013B.namprd02.prod.outlook.com (2603:10b6:610:4d:cafe::f5) by CH2PR19CA0002.outlook.office365.com (2603:10b6:610:4d::12) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.11 via Frontend Transport; Thu, 25 Dec 2025 09:24:52 +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 CH2PEPF0000013B.mail.protection.outlook.com (10.167.244.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Thu, 25 Dec 2025 09:24:52 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) 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.2562.20; Thu, 25 Dec 2025 01:24:43 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 01:24:42 -0800 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Thu, 25 Dec 2025 01:24:41 -0800 From: Shani Peretz To: Maayan Kashani CC: dpdk stable Subject: patch 'app/testpmd: fix flex item link parsing' has been queued to stable release 23.11.6 Date: Thu, 25 Dec 2025 11:18:36 +0200 Message-ID: <20251225091938.345892-75-shperetz@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251225091938.345892-1-shperetz@nvidia.com> References: <20251221145746.763179-93-shperetz@nvidia.com> <20251225091938.345892-1-shperetz@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF0000013B:EE_|SJ2PR12MB8979:EE_ X-MS-Office365-Filtering-Correlation-Id: a85f4d69-940d-48b8-11b4-08de4397757b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|376014|82310400026|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?SKlWIXgtGWoavbCmd+8J1sAEQ98seJggZ3p/lyALP/TpA0qAAevCjN2MjnnC?= =?us-ascii?Q?oaNslNlefZankUNWlcZaiC8rFWCSvT0nz8fhJSzDl3q/L/+vnM1R28fpX2Ap?= =?us-ascii?Q?l0ew/mnX0O+lN9nfh/K6ch6oGWb+l9UmEI0k0uy245XVFwniJQKF2/8SjsOM?= =?us-ascii?Q?orKaSRX7AicSl7L8EveIwDNNFJ4fx2UTMP+fEzkZsho15iNJswzFyy9K0CwB?= =?us-ascii?Q?I9D/ljbCjumV4tSwLKBTvj2T7s/9lf1yktdBvaunr134VjPFaHCvW0habwHH?= =?us-ascii?Q?DzZdlFGZDZIWYXhJifu+fXpWuSPMO6HgwlIDvovB9dczx9Rvc+o3d5LFmvw3?= =?us-ascii?Q?g9107KG39tbnwEB2qlWmx/pOhRIL8uMpInLeauADlnXzl7nYKFKYcpdxLEhl?= =?us-ascii?Q?AoGlQN/IC2T+sQqL2HVXSQ3wVZ7tiSvj627SvHFNazq9dzyTyNmgIOkD+7qo?= =?us-ascii?Q?/W4VjptIWFkKoVwFmXkLzD+zxSPBg8eoFbcEQn5UqLggyjecA4OiQzaOAWzd?= =?us-ascii?Q?aurH+2E7pCKZfSKHO6XXt6JCzTjwYytm5UeoPFXBJmVybbnsUL1n4O/vNL6N?= =?us-ascii?Q?sJh7XYbQvM+1+LG4kleoTmuLAEFj1jGDCPkF74iFK/VrgC+Wrj8USF7wtzS8?= =?us-ascii?Q?wLGWeP3rJGMN4qQ4t3a57Z8uizMO7N6PQ4rNCyuhtv3lN7GSWs63tjGoXu05?= =?us-ascii?Q?QCsGNiwHsJWv9Wju2U3+bIUULNkI4Evyx2LbsxgVooVlvgopOHcBSDXf+h54?= =?us-ascii?Q?u2XFn+giLzjgStDZQWKdQZ7zfEbzppZOM87jZ+qJqaV0JxTo2oZYM/ZOGvZX?= =?us-ascii?Q?GJueet71RMq9QUZjdH+wMYg/iEECg/04UhDvUP5SkU441gLdxkJxh6wfXFAW?= =?us-ascii?Q?3+tyuvv6XKmERxD3rqQrSJP134dm3WvSh1ExsDbDCiS2ZGCoNA2+dHtbXDw+?= =?us-ascii?Q?Z0ghGPLHuZSxiv4h3NsvecSJsoMs3XC81dGanJd7VynLCTKcL28xqYdFcCVp?= =?us-ascii?Q?QfAP3YyKC2KaQMw3hl/E/xtL3wYnDEWHPXcVDjYafT1SPIsdL19taMhcJ+N9?= =?us-ascii?Q?eGqsZ43eikUrC/DoUV703Ux+dQiM38WJxfqpU7imUM4YBsceQZEscxHr7Ye5?= =?us-ascii?Q?CQqDoxY5N3QUNan+lbKQHU2WaX4h75sTrA38djszb77NFir1KdEoV5bBxa6N?= =?us-ascii?Q?J6xLQ2eGZco+XC0NksqHDEGSW7jNZ71fQm5VjCO9g5uUwUcnewORHJN9jr93?= =?us-ascii?Q?CzPMTIS5nC+kWn7D5PTB+unxeoiF4E+mNs4FjFbVROqLoVxNcx0PK4YMPFx9?= =?us-ascii?Q?58EQr5zU6/gxhi5cVGonyWDJYvlEjPQy3AomfsEmDyUaBve33RvBsmz0hP9u?= =?us-ascii?Q?UNmULhqj1QGre2StUCj5wEwiK5E+IBLSSG11Nr43bO+SKj0AM4t/yOGQRNyI?= =?us-ascii?Q?r5OqkMWK6NKBgIUgjCvsJRdbrqW5jyqRbL9lsc37IH1YAwtCM+bNk3pZIWrF?= =?us-ascii?Q?Js5HC9nkYWbqIIkzZH6YM7lgiCih3bHdc7LYxySin1e5vRQHk/XLfFk+dkvP?= =?us-ascii?Q?GxkDGgXdgCSbz/59BXI=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)(1800799024)(36860700013)(376014)(82310400026)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 09:24:52.1708 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a85f4d69-940d-48b8-11b4-08de4397757b 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: CH2PEPF0000013B.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8979 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.6 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/30/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://github.com/shanipr/dpdk-stable This queued commit can be viewed at: https://github.com/shanipr/dpdk-stable/commit/5acfbf1283c41f32ee8a0faa982025b444ce9cf1 Thanks. Shani --- >From 5acfbf1283c41f32ee8a0faa982025b444ce9cf1 Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Wed, 26 Nov 2025 16:13:59 +0200 Subject: [PATCH] app/testpmd: fix flex item link parsing [ upstream commit 39454e245b ] The flex_link_item_parse function was using FLEX_MAX_FLOW_PATTERN_LENGTH for all memcpy operations regardless of the actual flow item type. This could lead to copying incorrect amounts of data. This patch enlarge data buffer to avoid the buffer overflow while continue to report same buffer size to flow parse. Fixes: 59f3a8a ("app/testpmd: add flex item commands") Cc: stable@dpdk.org Signed-off-by: Maayan Kashani --- app/test-pmd/cmd_flex_item.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/app/test-pmd/cmd_flex_item.c b/app/test-pmd/cmd_flex_item.c index e6e1cefeb3..a799b31ffd 100644 --- a/app/test-pmd/cmd_flex_item.c +++ b/app/test-pmd/cmd_flex_item.c @@ -134,6 +134,7 @@ flex_link_item_parse(const char *src, struct rte_flow_item *item) struct rte_flow_attr *attr; struct rte_flow_item *pattern; struct rte_flow_action *actions; + size_t sz; sprintf(flow_rule, "flow create 0 pattern %s / end actions drop / end", src); @@ -143,21 +144,38 @@ flex_link_item_parse(const char *src, struct rte_flow_item *item) if (ret) return ret; item->type = pattern->type; + switch (item->type) { + case RTE_FLOW_ITEM_TYPE_IPV4: + sz = sizeof(struct rte_flow_item_ipv4); + break; + case RTE_FLOW_ITEM_TYPE_IPV6: + sz = sizeof(struct rte_flow_item_ipv6); + break; + case RTE_FLOW_ITEM_TYPE_UDP: + sz = sizeof(struct rte_flow_item_udp); + break; + case RTE_FLOW_ITEM_TYPE_TCP: + sz = sizeof(struct rte_flow_item_tcp); + break; + default: + printf("Unsupported item type in specified in link\n"); + return -EINVAL; + } if (pattern->spec) { ptr = (void *)(uintptr_t)item->spec; - memcpy(ptr, pattern->spec, FLEX_MAX_FLOW_PATTERN_LENGTH); + memcpy(ptr, pattern->spec, sz); } else { item->spec = NULL; } if (pattern->mask) { ptr = (void *)(uintptr_t)item->mask; - memcpy(ptr, pattern->mask, FLEX_MAX_FLOW_PATTERN_LENGTH); + memcpy(ptr, pattern->mask, sz); } else { item->mask = NULL; } if (pattern->last) { ptr = (void *)(uintptr_t)item->last; - memcpy(ptr, pattern->last, FLEX_MAX_FLOW_PATTERN_LENGTH); + memcpy(ptr, pattern->last, sz); } else { item->last = NULL; } -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-25 11:16:40.081713393 +0200 +++ 0075-app-testpmd-fix-flex-item-link-parsing.patch 2025-12-25 11:16:36.104907000 +0200 @@ -1 +1 @@ -From 39454e245b125ae555bc5a3a058cc3c1e1280f82 Mon Sep 17 00:00:00 2001 +From 5acfbf1283c41f32ee8a0faa982025b444ce9cf1 Mon Sep 17 00:00:00 2001 @@ -3 +3 @@ -Date: Sun, 16 Nov 2025 14:14:37 +0200 +Date: Wed, 26 Nov 2025 16:13:59 +0200 @@ -5,0 +6,2 @@ +[ upstream commit 39454e245b ] + @@ -10,5 +12,2 @@ -This patch adds a switch statement to determine the correct size based -on the actual flow item type (IPv4, IPv6, UDP, TCP) and uses that size -for the memcpy operations on spec, mask, and last fields. - -Also adds validation to reject unsupported item types. +This patch enlarge data buffer to avoid the buffer overflow while +continue to report same buffer size to flow parse. @@ -16 +15 @@ -Fixes: 59f3a8acbcdb ("app/testpmd: add flex item commands") +Fixes: 59f3a8a ("app/testpmd: add flex item commands") @@ -21,2 +20,2 @@ - app/test-pmd/cmd_flex_item.c | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) + app/test-pmd/cmd_flex_item.c | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) @@ -25 +24 @@ -index e6e1cefeb3..af6c087feb 100644 +index e6e1cefeb3..a799b31ffd 100644 @@ -28 +27,9 @@ -@@ -143,21 +143,22 @@ flex_link_item_parse(const char *src, struct rte_flow_item *item) +@@ -134,6 +134,7 @@ flex_link_item_parse(const char *src, struct rte_flow_item *item) + struct rte_flow_attr *attr; + struct rte_flow_item *pattern; + struct rte_flow_action *actions; ++ size_t sz; + + sprintf(flow_rule, + "flow create 0 pattern %s / end actions drop / end", src); +@@ -143,21 +144,38 @@ flex_link_item_parse(const char *src, struct rte_flow_item *item) @@ -32,3 +39,18 @@ -- if (pattern->spec) { -+ ret = rte_flow_conv(RTE_FLOW_CONV_OP_ITEM_MASK, NULL, 0, item, NULL); -+ if ((ret > 0) && pattern->spec) { ++ switch (item->type) { ++ case RTE_FLOW_ITEM_TYPE_IPV4: ++ sz = sizeof(struct rte_flow_item_ipv4); ++ break; ++ case RTE_FLOW_ITEM_TYPE_IPV6: ++ sz = sizeof(struct rte_flow_item_ipv6); ++ break; ++ case RTE_FLOW_ITEM_TYPE_UDP: ++ sz = sizeof(struct rte_flow_item_udp); ++ break; ++ case RTE_FLOW_ITEM_TYPE_TCP: ++ sz = sizeof(struct rte_flow_item_tcp); ++ break; ++ default: ++ printf("Unsupported item type in specified in link\n"); ++ return -EINVAL; ++ } + if (pattern->spec) { @@ -37 +59 @@ -+ memcpy(ptr, pattern->spec, ret); ++ memcpy(ptr, pattern->spec, sz); @@ -41,2 +63 @@ -- if (pattern->mask) { -+ if ((ret > 0) && pattern->mask) { + if (pattern->mask) { @@ -45 +66 @@ -+ memcpy(ptr, pattern->mask, ret); ++ memcpy(ptr, pattern->mask, sz); @@ -49,2 +70 @@ -- if (pattern->last) { -+ if ((ret > 0) && pattern->last) { + if (pattern->last) { @@ -53 +73 @@ -+ memcpy(ptr, pattern->last, ret); ++ memcpy(ptr, pattern->last, sz);