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 9B45346A63 for ; Thu, 26 Jun 2025 14:06:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8FF20400D6; Thu, 26 Jun 2025 14:06:07 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2043.outbound.protection.outlook.com [40.107.236.43]) by mails.dpdk.org (Postfix) with ESMTP id 52162400D6 for ; Thu, 26 Jun 2025 14:06:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZauSOtdDDDvy2g7b4tdCk2HjwX/2bxzFSSeXTG79GK6appbVL41evf2j2WFgGywQHyIwfx9IYE9Mb6lA0xx9B1E5n/Le36Xm50eceSbPDHNAEU981Q6YEEiStZfwkJMOcMQqWq8KaOCfsLSwyx1SBw1X6TS0vvvKoHmfDtVDSfivFGObaTPBO2fSdZF6F9ETXyz1E9j3RzmdotmS/d5a5LqifO4Fk9FRUqrec5RHMb8KfkAwVaC00hbxLIhxzyvzpdYIvlRwBpV3BceQ+qLLRs6krhP5lMPBvnSxcgWZJ0xf5q1pfjppw34EpVDc8nVFwleaCxjxP2jhn10fHahKkQ== 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=rOqLU4stJumDbYuuzrGV81cN3oXOCZweS9QN2oyy1CA=; b=mNT+5jyW10hCToJlBjKj5MF3wTTD1ZIXfhl5WEp4HqaUH79JXF8C+C0T4wGvuIc9eYM3VAvVuCFAUQiB7kelVa8+BH6hBhxXle1MHBmLOqWlY7r/sYQ5SvTipIN7JRhtWNXCu24I80ByhAfy2tEfvKdvcNS11MYgT2vmRVOC1dNH/yIypGSZOacecS6ICyVUIpznDstiqfduBZTsmGmeMRccmU7jOgR/BMUEclYSWQGZ5anqAmKiCc4R2OUe/SQPs3BezjOfRW/S7fNemm50Rc8QM9eoalWRrjncKeNnjbdg/f5uGjUyapIK6IJcNkHTudkwBeIQadxlp5Zv2M/Z4g== 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=rOqLU4stJumDbYuuzrGV81cN3oXOCZweS9QN2oyy1CA=; b=MYshCmb6zNNaRO5szrX8RGhmB9oE+kk9upLn/vCIu1ecJ1wKtcWYLLNfat/wGhIhD22h9WjDAKnEcZEntz7ueUXP1PhhpDPsdpZjQ2fl70pW0Py0kKrzNL4EF4/fKbpaVt1k1gW2P6b0YQdMqqsQNowjZSo0WKAs6Qgxu1BDfkjAhptYKN6BBGO1MBbezjLa/tyLG8CkaXJ2IuxtO5aAd3TdJL1i6pk9roKJUkuKqVg1b3mSBXbRshQpNaKH6CScwXuTOOJ28RrgsblcMiLdKc3430yB0sDnLOyz096qPmTok+akyggFUBaLT7KlhiWqHqG2KJefW4Biu4JdlkTSkg== Received: from MN2PR08CA0011.namprd08.prod.outlook.com (2603:10b6:208:239::16) by SA1PR12MB5638.namprd12.prod.outlook.com (2603:10b6:806:229::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.23; Thu, 26 Jun 2025 12:06:00 +0000 Received: from MN1PEPF0000F0E4.namprd04.prod.outlook.com (2603:10b6:208:239:cafe::53) by MN2PR08CA0011.outlook.office365.com (2603:10b6:208:239::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.23 via Frontend Transport; Thu, 26 Jun 2025 12:06:00 +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 MN1PEPF0000F0E4.mail.protection.outlook.com (10.167.242.42) 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:05:59 +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; Thu, 26 Jun 2025 05:05:43 -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:05:41 -0700 From: Xueming Li To: Stephen Hemminger CC: Xueming Li , Hemant Agrawal , dpdk stable Subject: patch 'bus/fslmc: fix use after free' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:01:04 +0800 Message-ID: <20250626120145.27369-45-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: MN1PEPF0000F0E4:EE_|SA1PR12MB5638:EE_ X-MS-Office365-Filtering-Correlation-Id: 521523e4-f876-48d0-d5af-08ddb4a9d0c0 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?zm8x5Z60T5Xr1Z8BizZgJOK+ukSf0oDzEFqoSqKiSjWNmxKz2hv7cw5b57PP?= =?us-ascii?Q?WGBHff/Aq3tpMblOY3nysV4RfA2ZarY0JviFhZx7dbDsYUbjL9oruYb3dSqL?= =?us-ascii?Q?XsvhJ7QyiOazecV9V1H9P1+OjU9lV07sye9Id951c0qCmqZaeEQfavIs3M6a?= =?us-ascii?Q?6Cql5i0EnZ+N3d3zKdb0HMGowjLiD40O3MdchOnYplC8VGdVwbgBA727PNwN?= =?us-ascii?Q?4wCeH6v2yOaaYzjdqabbweEOhs+d7Y31Ax4rWEi0YZlrvyy52cS3YWvJzrjN?= =?us-ascii?Q?1x+qIisyanE0yjPr6KKDjn4CNPq/9sPOxfDfPk9DJyoa/fGaYacP8qQHSexD?= =?us-ascii?Q?KVnCT/rh2FcnyqlObL0LGroBux6p8e2Ju1ANkyn9vno5QM8+7iuGUSF/xNNa?= =?us-ascii?Q?WMrO8i8wn/UFyJ4QzKYFlmcvcUkxhyKLuo2Bt3epnJAe3fL6tZ3qypb1nVGk?= =?us-ascii?Q?XVOqQptJ5p1sWGix7JPsb2Mb8HAMxOJ5a3fvhnbNTooe0obKC6baRD+MgYe9?= =?us-ascii?Q?gFseK4GaBIY+7e3QxP4PK0fuRiNbgzxe52L94liv6scJtfVYhluNdJ7qi+of?= =?us-ascii?Q?iFPeh3oXVjDHzMMd3GvGPpFjqRp3AyOuvyJzUpyLUFPQgAaeYzqVv/GS7rYl?= =?us-ascii?Q?pr15bLW0tysXtNNfV4g1d4XPtviRNZ0AV2ouLYq3bEZrceFCJ+ZWXX9JtEuO?= =?us-ascii?Q?yG9CHyzqWo9uWpti7YCQ+M+UsHYylobR1LRfoiFCCG6FvZR/qimvnXpv11w8?= =?us-ascii?Q?XGU+PfGh0hbxyK1C8BDq68/Humcf5OObW4iUJunAbKWvIGHWVmeYr7qfTzcQ?= =?us-ascii?Q?r8lre2XU6z94uJcTuxm8WpDh3ZGbgb8GaBR3j05OHt6P/YnBWm8Z8vbtA6Bj?= =?us-ascii?Q?8wXYQzztzLR7O4yTwcjsqWVmfim5y8VttsydA3DaCIUm5qjUZIy3kwUKdLXo?= =?us-ascii?Q?IetRUht0RZNCM4zC6hTvfeMh6uy8A7bfvQle0upZ0aeTYTorfRY56DC84dK9?= =?us-ascii?Q?+HYzwnXCu+oc6mtkbV1OD/GWC/d2Qarrocc426lg847quA1N6l306QmUO3iL?= =?us-ascii?Q?4jxoFZUpMUUBnxHHKp7BXlAoly4laQiyl/Rc3lVYRnPPehMfksmBwL5ekc1i?= =?us-ascii?Q?SL1s3ja18B53XpX5keYYS7fF6AWiCr3j3HjOjSCYs8CWEuwJVXHwzXWZRN1G?= =?us-ascii?Q?OzAo0KOPS6HUHxhzFt3njTCcoahkMSFyqxTVKCuSzbXS2EjtQwxbpxKngIxI?= =?us-ascii?Q?D+VVEQWxIUUquVTkXCJ/ld2c/kaF4kDZLZTkyEWIrjeeU4k7eklLiuyt5wK9?= =?us-ascii?Q?feS8HHpwesRKD4Yk2H2NZbD03HLX60c+Jmg1bWcMvcUV9Qvq3F1NDWyZ3icw?= =?us-ascii?Q?S2VzIS68dR3kvdqq3pUg+nnu2hkUDzCamzpgpiIoEDNFuZAo4bwpWQfLrGlr?= =?us-ascii?Q?43HV1sCj1p1rwGr/fBlnZmeuUhoUYKTpxEXOE4EUTHUyMS/QrGXYZ3oU5oue?= =?us-ascii?Q?Q6UyJGWbLj4C783XothxTEXCmrWPuYtEWy+m0WU6Kdia1l2MYrLzZ72M3A?= =?us-ascii?Q?=3D=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)(82310400026)(1800799024)(36860700013)(376014)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:05:59.9336 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 521523e4-f876-48d0-d5af-08ddb4a9d0c0 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: MN1PEPF0000F0E4.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB5638 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=ed431a08683c81811b018ad9d3df28e8f9bb7f74 Thanks. Xueming Li --- >From ed431a08683c81811b018ad9d3df28e8f9bb7f74 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 16 Apr 2025 07:58:14 -0700 Subject: [PATCH] bus/fslmc: fix use after free Cc: Xueming Li [ upstream commit 1cad17c43079268d9e15db62b3a1edd42df8d81e ] The cleanup loop would dereference the dpio_dev after freeing. Use TAILQ_FOREACH_SAFE to fix that. Found by building with sanitizer undefined flag. Fixes: e55d0494ab98 ("bus/fslmc: support secondary process") Signed-off-by: Stephen Hemminger Acked-by: Hemant Agrawal --- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c index 4aec7b2cd8..6bf3b15be9 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c @@ -38,6 +38,13 @@ #include "dpaa2_hw_dpio.h" #include +#ifndef TAILQ_FOREACH_SAFE +#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = TAILQ_FIRST((head)); \ + (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \ + (var) = (tvar)) +#endif + #define NUM_HOST_CPUS RTE_MAX_LCORE struct dpaa2_io_portal_t dpaa2_io_portal[RTE_MAX_LCORE]; @@ -364,6 +371,7 @@ dpaa2_create_dpio_device(int vdev_fd, int object_id) { struct dpaa2_dpio_dev *dpio_dev = NULL; + struct dpaa2_dpio_dev *dpio_tmp; struct vfio_region_info reg_info = { .argsz = sizeof(reg_info)}; struct qbman_swp_desc p_des; struct dpio_attr attr; @@ -549,7 +557,7 @@ err: rte_free(dpio_dev); /* For each element in the list, cleanup */ - TAILQ_FOREACH(dpio_dev, &dpio_dev_list, next) { + TAILQ_FOREACH_SAFE(dpio_dev, &dpio_dev_list, next, dpio_tmp) { if (dpio_dev->dpio) { dpio_disable(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->token); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:19.568599453 +0800 +++ 0044-bus-fslmc-fix-use-after-free.patch 2025-06-26 19:59:17.386418044 +0800 @@ -1 +1 @@ -From 1cad17c43079268d9e15db62b3a1edd42df8d81e Mon Sep 17 00:00:00 2001 +From ed431a08683c81811b018ad9d3df28e8f9bb7f74 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 1cad17c43079268d9e15db62b3a1edd42df8d81e ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index bad25a0ec2..e32471d8b5 100644 +index 4aec7b2cd8..6bf3b15be9 100644 @@ -23 +25 @@ -@@ -39,6 +39,13 @@ +@@ -38,6 +38,13 @@ @@ -36,3 +38,3 @@ - RTE_EXPORT_INTERNAL_SYMBOL(dpaa2_io_portal) -@@ -412,6 +419,7 @@ dpaa2_create_dpio_device(int vdev_fd, - struct rte_dpaa2_device *obj) + struct dpaa2_io_portal_t dpaa2_io_portal[RTE_MAX_LCORE]; +@@ -364,6 +371,7 @@ dpaa2_create_dpio_device(int vdev_fd, + int object_id) @@ -45 +47 @@ -@@ -597,7 +605,7 @@ err: +@@ -549,7 +557,7 @@ err: