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 04AA8457A1 for ; Mon, 12 Aug 2024 14:56:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F2FD940669; Mon, 12 Aug 2024 14:56:00 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2070.outbound.protection.outlook.com [40.107.101.70]) by mails.dpdk.org (Postfix) with ESMTP id 3E2D14029C for ; Mon, 12 Aug 2024 14:55:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=L8Oni5S4MnGgHus3M/86D4SbE/VJiSr+ufQYC1SMiluIjWOUmnjjpdQS4N89OKDHQEik8E6l8daIX/AE9YY/2cEwysSCyiA3TIr4VPZRRcsHjLeUpNLIAfziIPsAV2c6sJ+35nsuc7cEzchWZ5i5PBjw9ySfFaO5egjhuamlCGVa2j5OlDY0pP4fXvoP7syxaa1P3ALMYWomAxm1OFSsH0/Ej1vI2H4/F5Ce5XJl/bzdJoGBPb2NYrJjUpvpUtc0g8H4K28dMTkK8tCDjI7rvQuUACIJFBteoMGgOOr4DT+mInNuDGKmzdfiaFMBpi0p1u3WFfW/11aYuJKA8dS3Ag== 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=z+2iyNr+qAfE2EMHdH/hD6Ukn95gVx2qDqNnfHMLh9A=; b=iRF4rTQrFtL8ejpRfENcZDiKdBha4Vou2FKF44muxOt7RzPmblDB6qewzBhNb6QgJ8QT1/1h7vdeo2ToiAxvNIZQgV1r9IaGm10YEKZ3s4j4vBA43Mma0qx/q+8PHGJnG/0ga+dD0qZxeW/WRoXC8KTd2cQJk7gLJ21vU45PSP2dNNWhInHQqtH+76RJXbBcRdILM9JJi3++1OPO3AXDyMclVLT5R2EzWlcVyiIai2XXdXFoV0CMVC6+vXecLTYUtBugeRmnaPEUusLg6qw5TNcFc2xkECVwQsqFiyH3+vWkgbesG43Wn4p0qarEHeEAQ63ohFgoUPxb6DsJHvsOrQ== 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=z+2iyNr+qAfE2EMHdH/hD6Ukn95gVx2qDqNnfHMLh9A=; b=ljHMbNfFhkr31Ajum6CqJc276SeuJtaRnB6URF980fwjh0vg7OASTCcQ5VauHMKI3o6EbCw9r68girQZ1O3DVgvzBQbKa/0jIVwhwbtxWea8dHSv0Xa07sBsRv3qm5G7eR25CCKd69niRMuRpofoL9yCjx9a0QjNEnafKDRxAuxV9dHH3zKyad9d1RpkRq8FiMBsCvsVZhtDtI/VxyWjNQBpBvElQoAQXKaEUB52hGKrnIPTXpo724z84fugoAhKYl+78pfRmwze90Vwy4AilmfnCDj/eyVftmc+LHmrBivseVdbYk4WXIth2Fo3oIGq7kZrFVf+441jgsyew6eATw== Received: from DM6PR08CA0044.namprd08.prod.outlook.com (2603:10b6:5:1e0::18) by MW5PR12MB5600.namprd12.prod.outlook.com (2603:10b6:303:195::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:55:56 +0000 Received: from DS1PEPF00017094.namprd03.prod.outlook.com (2603:10b6:5:1e0:cafe::cf) by DM6PR08CA0044.outlook.office365.com (2603:10b6:5:1e0::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20 via Frontend Transport; Mon, 12 Aug 2024 12:55: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 DS1PEPF00017094.mail.protection.outlook.com (10.167.17.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:55: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; Mon, 12 Aug 2024 05:55:42 -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.4; Mon, 12 Aug 2024 05:55:40 -0700 From: Xueming Li To: Stefan Wegrzyn CC: , Ian Stokes , Bruce Richardson , dpdk stable Subject: patch 'net/ice/base: fix pointer to variable outside scope' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:48:48 +0800 Message-ID: <20240812125035.389667-52-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-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: DS1PEPF00017094:EE_|MW5PR12MB5600:EE_ X-MS-Office365-Filtering-Correlation-Id: 13f2f593-44ab-4f80-2958-08dcbace1b59 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?609cVT2QPzeXCWaBAuNUyb3s/nofeI8CQsQVgxcl6pHfcwYR+IEQgnpQc9DL?= =?us-ascii?Q?f8jsr9KHlHCQsIwx2aDtz0t0VB4mQEDSZMWQxAiY15AwP/Y2sO+rhNA4uoOr?= =?us-ascii?Q?PvO9gzVTK/bjBKKwbxjLQD4+JG8vAQ6kfwJq5jJI/WcKm0A/ZDLOChNoCXK9?= =?us-ascii?Q?aMaiCXuKiAp0K7/RDpXjqMnZd40e4IbSlsVGGOf2EYN/gPy3mn2DsoOgHOpt?= =?us-ascii?Q?fVPYp1gINo/eqiJ+hsJvap5wPRHC6VA3i7K2V8Fpm4TZQPRiOWU74/3Kqfqy?= =?us-ascii?Q?fHhyIP3JKV3o8D1Dz8oqaWvviG3Z10aQWxPXHstMmkZ4HYUvKxqhrTcc8Bhi?= =?us-ascii?Q?LyK8arlafS2/FXxjWyE/qD0c0nFHgTlk7J5rwbr+GFbA7J4m2tGoDSMjxvL4?= =?us-ascii?Q?jMyhykQSRsB/H6mvmA0N//DzEYBKO+qGgeowuVDme14yzIXd+MkHvYjHyYFl?= =?us-ascii?Q?HLcnaNqI36Eyx4dDOkkMYEVUj0115Qg69vHdMLZYf+utTgYlUZXo/09aTaEd?= =?us-ascii?Q?5ND7p+yX62PEGZJBmhCW08wfcxxyxJQpUZ7OK1sqYUE5NY5CxJHv+XkpbXZb?= =?us-ascii?Q?lGALJ3tiI8u+Zn0pCB+5ewXD0aoBKdztzK2wJPRvfbyEerr7saZobBSRA75o?= =?us-ascii?Q?2zvw95OUk/YTeV1eKgQSVPFqk5ji14w+S4k5w97VW/j2nb1965WPEBEGJeV7?= =?us-ascii?Q?FvniTsNcLUlH7u3StfkAoMxxAvqXZ3CFBqjVlA5XgbCIbDOt39uQgSHnYhsW?= =?us-ascii?Q?aco+u5ToFZRzCkMc7aNBrPwiqD7P2X6hMVE1iB0i0RVy4Nckgck7JF8xHmVK?= =?us-ascii?Q?9+tTH9XCt+Tka58mpa9UWGCrB7wpGur2bP+nfIFabNnJW/o9johASwfQ319U?= =?us-ascii?Q?iFp58f6mryKwYK8RuE72N3mxTIitR/YrYXGrLmVGF/IUQCRknkal3hfD0nJR?= =?us-ascii?Q?YBBjfM/QlMF8+K3IAFvwNS25h4BlSJIXAnoDdcRmDdzgu6jqd+Ukzr1vRnx7?= =?us-ascii?Q?NPaLKzgwdCydFeWZoyeJHWlMw2CSk92F+NRUuyWR9+rrmCCzDUlAGFb4ySCz?= =?us-ascii?Q?COh9KfRonHeFhvss45xplc6Tnm/F1v3kCRj1rptgJUpBPZEOQ/1QudrK3s+t?= =?us-ascii?Q?lHuX5OsagKaBKTOma3gJ3DPvTRtGz8PFHK2xcFiX8DtoZxmA7Ogux1BLfTqx?= =?us-ascii?Q?JqvbZihKpi7aVW138KS13jhNQ9vtGcbbKI1jNrr1bFYd2lZ0SoxVdlhtsYyx?= =?us-ascii?Q?7MV3pe6kMx6gZaB7180yGqxfQycmLHRWvb+ja7hI63rBsgGhWD/TnA30BnbN?= =?us-ascii?Q?sHpJ+kqWvLKFZyfS7w8FxZFjWXcdY36ZQJgcSt+CWHgH4xdUHDSUq49oBcWI?= =?us-ascii?Q?Oiy8PWV9IqUvVc1Y6LTp7CVOvRPPBpaxfshy7qeal2C7rzlG6X6GDbsNk/21?= =?us-ascii?Q?/vH2OS+BhvhE0nwMBiU0YgQzJnkxTRL8?= 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)(376014)(82310400026)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:55:56.2750 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 13f2f593-44ab-4f80-2958-08dcbace1b59 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: DS1PEPF00017094.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR12MB5600 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/14/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=87d7cf40823272f5556dc23a24bf325b1a7b0af4 Thanks. Xueming Li --- >From 87d7cf40823272f5556dc23a24bf325b1a7b0af4 Mon Sep 17 00:00:00 2001 From: Stefan Wegrzyn Date: Tue, 25 Jun 2024 12:12:10 +0100 Subject: [PATCH] net/ice/base: fix pointer to variable outside scope Cc: Xueming Li [ upstream commit 794adf885cbbc949b4a292ce98bc57d77ea77391 ] Currently, the 'temp' variable is in smaller scope than 'first_teid_ptr' which can point to it. This means on new loop iterations the memory goes out of scope and we can end up with a dangling pointer. Move 'temp' to outside of the loop to fix it. Fixes: 254f19c8c061 ("net/ice/base: modify recursive way of adding nodes") Signed-off-by: Stefan Wegrzyn Signed-off-by: Ian Stokes Acked-by: Bruce Richardson --- drivers/net/ice/base/ice_sched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_sched.c b/drivers/net/ice/base/ice_sched.c index a4d31647fe..75dd15c3f3 100644 --- a/drivers/net/ice/base/ice_sched.c +++ b/drivers/net/ice/base/ice_sched.c @@ -1069,11 +1069,11 @@ ice_sched_add_nodes_to_layer(struct ice_port_info *pi, u32 *first_teid_ptr = first_node_teid; u16 new_num_nodes = num_nodes; enum ice_status status = ICE_SUCCESS; + u32 temp; *num_nodes_added = 0; while (*num_nodes_added < num_nodes) { u16 max_child_nodes, num_added = 0; - u32 temp; status = ice_sched_add_nodes_to_hw_layer(pi, tc_node, parent, layer, new_num_nodes, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:04.225899863 +0800 +++ 0051-net-ice-base-fix-pointer-to-variable-outside-scope.patch 2024-08-12 20:44:02.055069287 +0800 @@ -1 +1 @@ -From 794adf885cbbc949b4a292ce98bc57d77ea77391 Mon Sep 17 00:00:00 2001 +From 87d7cf40823272f5556dc23a24bf325b1a7b0af4 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 794adf885cbbc949b4a292ce98bc57d77ea77391 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index d694bfd414..c9d70fb043 100644 +index a4d31647fe..75dd15c3f3 100644 @@ -28 +30 @@ - int status = 0; + enum ice_status status = ICE_SUCCESS;