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 219FF46532 for ; Tue, 8 Apr 2025 10:03:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1AF024027F; Tue, 8 Apr 2025 10:03:48 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2085.outbound.protection.outlook.com [40.107.220.85]) by mails.dpdk.org (Postfix) with ESMTP id 088CA40E5E for ; Tue, 8 Apr 2025 10:03:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Nv2XIM3d4oTUgbxREg0AaJmlcP0vPKxvqOPe6+RLcBrWn9rxQpeoXRQVJvpWAiinpHxfmGRfmU3Sl+Q0H40kY7WcmrnRbDx5L2e/+q3gX/POCcUEqap19a9Ko8CiyhFA/enozpGL74gd1XgUYnptw1BFh4ax7qShIq3ayCOO1myAXQFGdVQt+xN4G5cll02r+fbqgqpXhB18Shn1IfWvpMLYVGGh/W/svIvz34OS1iC1ZH15dVJ07//LN4fxB7xrtBfQY2Yyi5wdIjj4UFCz6g6bLW1veca6qgaQelzDv8DzMrg4m1W5IhPer3mMFXkQ7IoQRWs0+60ojlXYXOtbtw== 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=+f3seRCWYbo3Dy7JaAgEfDSMPb0NcBvl02crjttDADM=; b=qqVQG7dDRS0jLIK6IdoAESmxqCP6Bg99TtDfrczj4EIH3miXuWJXLplgcKIt5Hdolc1hSCL0X8s3kTHa/CI5GHR5cYKKKvpurX6/DQyIu7wOPIB/5aAF2gYxZeI9SaljDFXQpfRCgFXwLZ+7BuRXisCO7HSrsmgEq7br8w+YQjvcZ5Jerr5IUm24AXrxk6gGEmiRI21RrvWSpRGX7Vqsndb/rV+GJmqFINg/HV1SR0n94YyaX4LiqAHBD6Kxj9jD1V0u4gFvwCMZ23Og+9IiuIqQMD6MMMyzy+hHnXj1R24YWrnglbJ3S7wGXRPYrcGDRVaBRsIjhEh+HHnsBZYQ4A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=redhat.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=+f3seRCWYbo3Dy7JaAgEfDSMPb0NcBvl02crjttDADM=; b=cJJwko0Y3UxsW4K3lFebdfXso1HmCk5wodjBzYeH/O708EvawkHdAs74PWPEVJ3fohkF5ZAh3WddKYSoeVmwTlnNqGwvxZGyFT1FztSNG4nuBXNpJ/0BufgebjhrZuUdWd8BeWDPC4z2QMTLdU2NuM67iXqcKGm/0Qq4pDDBnVzF05WYzkSs6I5dnnzp01trmgO/k2vwZZd5TXXwMsxiaHeueBW0NZV2lMAvFjzfHeO19mENjvAGhZRiWVKJZbJ+vtQoRIDrIjHjCQPg/gMr2YEXbBHqCqfUXFVLLXsVlMKic1+ssIM+NiL4LRnqGdvw0ucPNSQaAjEG/bW+rxm5ZA== Received: from PH8P221CA0064.NAMP221.PROD.OUTLOOK.COM (2603:10b6:510:349::16) by DS0PR12MB7925.namprd12.prod.outlook.com (2603:10b6:8:14b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.31; Tue, 8 Apr 2025 08:03:42 +0000 Received: from BY1PEPF0001AE19.namprd04.prod.outlook.com (2603:10b6:510:349:cafe::8c) by PH8P221CA0064.outlook.office365.com (2603:10b6:510:349::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8606.35 via Frontend Transport; Tue, 8 Apr 2025 08:03:41 +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 BY1PEPF0001AE19.mail.protection.outlook.com (10.167.242.101) 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:03:41 +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:03:24 -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:03:22 -0700 From: Xueming Li To: David Marchand CC: Xueming Li , Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix leak in HWS flow counter action' has been queued to stable release 23.11.4 Date: Tue, 8 Apr 2025 16:01:44 +0800 Message-ID: <20250408080214.371154-6-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: BY1PEPF0001AE19:EE_|DS0PR12MB7925:EE_ X-MS-Office365-Filtering-Correlation-Id: 725afcfb-0121-4a6d-9c33-08dd7673e092 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?GVazlLoLW1xXBuDFQryfS4iEXhRtvIG5EGs1SAd5iW8o+oidW0c1bokwBW1o?= =?us-ascii?Q?52t4h5zlykS5/cuUkLQ55Z1mOyf0GME364/yHpcUEibehnvRaoYkXMVFeUlG?= =?us-ascii?Q?j0kMcFjX5EXe2OQaUih+fCDnAP11V/9uTvodB6KuQE4k21TEaKEYElgL8Ssr?= =?us-ascii?Q?WejKMqFXdhlUTpgYaSbHxCKgxj61+Zfamg+rcj0JNQzzvL34goR3rS/g0g0l?= =?us-ascii?Q?LAh4SLdWv7nna0DCcECzH8dQu9yp/1mMvhr9q2iCTuo7fqjUjC65WkFOvrT1?= =?us-ascii?Q?xXFP2YJiYdbE5r9+ZVzpjftZsFhyuA4ryVP10sheaUwSMAhrXMbwHrzYYg5k?= =?us-ascii?Q?GOe1GDUR8VBAFgdTExAp4oLDwKXTAr/3W6+Bt2EuR07PHfh1HDgBopO7G/HW?= =?us-ascii?Q?ZbgHfe040fLMR6XTZAM6i96MHoosVMCs7tdxA+/k+tseY6vxvdltY3y7r4zc?= =?us-ascii?Q?Oqopz1Gu6rNAeB1fe96IedqAc8GWobrq2wuP60jqJU0JAk/ohcD59xEvsYAa?= =?us-ascii?Q?TVivdUv0Hx1ygkXvljK5X2wtdKUlGohIThiJgZcWrs6926kjVB9sXZLZkOLS?= =?us-ascii?Q?0/Rv03hZfnI2N8lG8o4cztQ3vCVBrw4U2YfFQd+UG09TFpFKcCtEGvIeM6ij?= =?us-ascii?Q?ehFtL3/29sYy37JVg8G6XFYtpA/YRSrB17AUu/8NX9Sq9D/ihDEIIxM1Bk50?= =?us-ascii?Q?vHoNswMcY6RaUnKoe7lHQYvU94RQ0OguX2llyzhuCTiVfmfSnvWkcd02V4so?= =?us-ascii?Q?jIdq8Ly12QLm8Ke6VHEl+19ffnVrb7JCOvKLJMJaXGqGQUFFkTg31Eynkm0h?= =?us-ascii?Q?AFPSyMTucEe6BVGTw1z7o2xFAapcTFaxScaX8xr6B6Q/ByCy4+LH8/fqjtbK?= =?us-ascii?Q?WxLP35AjSfzK6ytAD1WehzqFP4ITYbMSVoA55Pf6/UKZbbhC58BvVWc6v0xg?= =?us-ascii?Q?4zPjSDUOnVqChj0TT9k7H0RpCouAmuOFHrH2y8kW+RNGyiLbm52aFevZE8XI?= =?us-ascii?Q?wQb3ZrF1+rxos5eRUx1gqvwxm4WyImXorwOr5jDQTNRMZcAw7Gllzjfv8PND?= =?us-ascii?Q?P6HVp9P/3JyWPxgs+rJVANQLriTU8sljR1nfh1ZqSScHt/YeG977aSzsAsM+?= =?us-ascii?Q?GLOzWfsR5o1q+mqc2V28gVIhgA39rLRd6radLhf8heD03m7OFIUVMnRmmmQx?= =?us-ascii?Q?MfMJODALb8MKvVlrf5td0w+1A/sqTw48fT+g2paYclajda8nG+tstwjPUlud?= =?us-ascii?Q?rZxoPxFj90HPYVsZYtlSy49HpsASCzR2WgQL5P/rs4w52xcLDwobLsjXa81R?= =?us-ascii?Q?8yERF00IxIIP0hGNYLWy6HEAdnq6upBlHUJsUD6LOSbBbNBd3T7wEGXuPM0l?= =?us-ascii?Q?k9XnguIzx7EaSNtP5mxdNrb6kbmXoZKsu3Y8g01o4dUufN1QAfNLLar4hThS?= =?us-ascii?Q?jpKCn7yXVfSaS0L8Df7fJpEFLypSmzqKgMNQu9HZFzESLy6rQBWbtCIv7eYC?= =?us-ascii?Q?Lq6TDhRpwOdRCT4=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:03:41.6718 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 725afcfb-0121-4a6d-9c33-08dd7673e092 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: BY1PEPF0001AE19.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7925 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=c544957af5fc3e3a83342c8205af524bc711eff1 Thanks. Xueming Li --- >From c544957af5fc3e3a83342c8205af524bc711eff1 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 27 Jan 2025 11:53:47 +0100 Subject: [PATCH] net/mlx5: fix leak in HWS flow counter action Cc: Xueming Li [ upstream commit 9e34fcc81c005a60c919c572ef83c10ebb0201af ] This was caught by our internal covscan. mp_name can be leaked in case of errors. Fixes: 4d368e1da3a4 ("net/mlx5: support flow counter action for HWS") Signed-off-by: David Marchand Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_hws_cnt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_hws_cnt.c b/drivers/net/mlx5/mlx5_hws_cnt.c index 7a88a4001a..ca6fd51cc6 100644 --- a/drivers/net/mlx5/mlx5_hws_cnt.c +++ b/drivers/net/mlx5/mlx5_hws_cnt.c @@ -677,7 +677,7 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, if (priv->sh->cnt_svc == NULL) { ret = mlx5_hws_cnt_svc_init(priv->sh); if (ret != 0) - return NULL; + goto error; } cparam.fetch_sz = HWS_CNT_CACHE_FETCH_DEFAULT; cparam.preload_sz = HWS_CNT_CACHE_PRELOAD_DEFAULT; @@ -713,6 +713,7 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, return cpool; error: mlx5_hws_cnt_pool_destroy(priv->sh, cpool); + mlx5_free(mp_name); return NULL; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-04-08 15:39:06.612768759 +0800 +++ 0020-net-mlx5-fix-leak-in-HWS-flow-counter-action.patch 2025-04-08 15:39:05.916436584 +0800 @@ -1 +1 @@ -From 9e34fcc81c005a60c919c572ef83c10ebb0201af Mon Sep 17 00:00:00 2001 +From c544957af5fc3e3a83342c8205af524bc711eff1 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9e34fcc81c005a60c919c572ef83c10ebb0201af ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 0197c098f6..eaceedd5ba 100644 +index 7a88a4001a..ca6fd51cc6 100644 @@ -22 +24 @@ -@@ -723,7 +723,7 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, +@@ -677,7 +677,7 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, @@ -24,3 +26,3 @@ - ret = mlx5_hws_cnt_svc_init(priv->sh, error); - if (ret) -- return ret; + ret = mlx5_hws_cnt_svc_init(priv->sh); + if (ret != 0) +- return NULL; @@ -31,2 +33,3 @@ -@@ -767,6 +767,7 @@ error: - MLX5_ASSERT(ret); +@@ -713,6 +713,7 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, + return cpool; + error: @@ -34 +36,0 @@ - priv->hws_cpool = NULL; @@ -36 +38 @@ - return ret; + return NULL;