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 792CA457A1 for ; Mon, 12 Aug 2024 14:56:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6F49F40668; Mon, 12 Aug 2024 14:56:04 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2047.outbound.protection.outlook.com [40.107.94.47]) by mails.dpdk.org (Postfix) with ESMTP id 9D00F402C3 for ; Mon, 12 Aug 2024 14:56:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fej89bkxPxSr2A6fwD3VEWUanx6LDbFfkKDS8O+ZVJpvudtlZ84rFyYwHWF9YX2WTdRA4G1o0qkvCTWT17v0k71MDFCWFuzvSwbMJevf0lUiTTfNdlesmsQwrybjAHTzOZ9NwOyDvfx5VA/s8IqL7gDKGeSOoQcxVodtl2FJTnjiOBynrHUWGAroYeTDODDr8/sPvJLmGeBZ/P4NC/cx5aylYQbm4wDgV9839x8l3qW/mYdxfLswqIUU5TXNFv5ytOhd0y4SjVkNKYw3ECInQx3N0vkW8rooX5WItNJ6xiBJMJ44MXz6aIVnTHpSzkNZIceAxjLHgDJIX5XPez+H8w== 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=SrnQaAhswzfWODbkzrM0GY7FMxvvYZAh59Vz2AyMooQ=; b=DpSlvZ2sQJ2bF5f67z0EHkLVcOM3GLLARFykmnbBo2xAzP+SWSOjzmk086gQHOXCwwjJPb9wrsvPOB0NVGyCpG7VGDfpCrsCV+k2lIIsBjQRKkEGjlKt9S2vTWKWMBxFr040haTP0ZnfVAqzhxvOR7K+YtV0oZkDsP8ytpXIEHS0Y0DiMIMZqDohkXVtJVyPx6jYIL0baKoQgzniGwor1czW5Q58Jn2v2+lsir2woaodsaSBKq1sCGPYUN89P5iClHXf5r1hwxG+5OMNUYCpH2UH3Yu7NtkZhroj3qXKWuVwxiDMxwaONyHyw4duyUZIn5H0Ty/mzkEHzMRkGbacNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=SrnQaAhswzfWODbkzrM0GY7FMxvvYZAh59Vz2AyMooQ=; b=WTnwfmr8aZ2bF9xZR/S+eqOZ1Jc0d63pu4/jtXS83YN1MATcV9Z5EdKo/d9AsFCOOCNllLevY5CyJa9R7d+x33K1wQFpYLP4U6TRCC/6cOqFMW9tch2FJgg2P8yOl9GjoK7rVV9YYjtdT63mX1OYNsK8DHg0wajgXFH2X/5codnGrOI/eGaR1a/b9nRGpzNhvKc+IlxBp1NwwxwRlAR+w918ExE6LlfFKd7+p/1zC8FhbfPA2+qWwo8G8PDceimI+TjkSWQBkQQ8lUnmE5BWTgwilHFfO7WjgxQHd2TRPZWfFevcZBXzVWc1Je0F/ddS8pW0VVKzG+e5rFIpNLfphQ== Received: from SA9PR13CA0131.namprd13.prod.outlook.com (2603:10b6:806:27::16) by SJ2PR12MB8882.namprd12.prod.outlook.com (2603:10b6:a03:537::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22; Mon, 12 Aug 2024 12:55:57 +0000 Received: from SA2PEPF00003F61.namprd04.prod.outlook.com (2603:10b6:806:27:cafe::71) by SA9PR13CA0131.outlook.office365.com (2603:10b6:806:27::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Mon, 12 Aug 2024 12:55:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SA2PEPF00003F61.mail.protection.outlook.com (10.167.248.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 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.67) 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:44 -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:42 -0700 From: Xueming Li To: Eric Joyner CC: , Ian Stokes , Bruce Richardson , dpdk stable Subject: patch 'net/ice/base: fix memory leak in firmware version check' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:48:49 +0800 Message-ID: <20240812125035.389667-53-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: SA2PEPF00003F61:EE_|SJ2PR12MB8882:EE_ X-MS-Office365-Filtering-Correlation-Id: 8a2f6688-e54e-4c9c-35ab-08dcbace1b5e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?x8bsiDeanaElty7QJgCJg+l4FCU5sA1gSEt6xb7UnFq9Pezmy9cxGYyuBw4D?= =?us-ascii?Q?E7Se3+AD0Kxi6+FtTxmKh/TgKC+v/K7b3B+j4dS6wSlRU0IE6E+BsFng3Wlp?= =?us-ascii?Q?iGUO0yRezBsXxWa5d8/oRd0/jTSudBAYZwmywlSEsp+ZlUi3sAqIINQ4qSh9?= =?us-ascii?Q?BE70IskgHicJQcMfwQ/FFb1KpDCl6Cctf+ygks3g+BhdYpuSG9Ryvyv0ASVY?= =?us-ascii?Q?ZjGIbV4XChbwFfOL75bj9v9W0vHt7LfY6OeN0eVY4fA3KX7klBx/gkqi6UeR?= =?us-ascii?Q?oLDYqvJ2+/jnUVdTI4sxaSd/rEb7wE73+mIH6Idpcv+aqrHs+YxF3ObOFKqW?= =?us-ascii?Q?/Htz2x3xYBGsHoGlgSqMBiX+g+8NL+4LqbJnYIHVuIVcSl8Wsd9NgmqUqgU7?= =?us-ascii?Q?kO6bqPJD6pns9elnSwRMYOotPLrOnc97KyA/VnV49Q9/uOn/snTFz4dl5rBF?= =?us-ascii?Q?ZPnPCTJ5lDnhf09tp46KDI7p6nFNg3/lgT1/atWHsQUR11rspxLZRS54Q9YL?= =?us-ascii?Q?+hgHR5qQUjYLsyP85QJeuCSoG5e4x0Bsc8lCpO0gC3XeUlBa8ALVWCmsLNr9?= =?us-ascii?Q?BxefGEI+rcaKxjPUwH52UKrDmhbPaxZ+G1ZSzwlI2qwVqUeDSAbAiKLdsMc8?= =?us-ascii?Q?C7ZF68cFIQbd0SD9zNPtnCqGxbG8gwX39ngCFrOGNh0HJafkZywsW/fKFWhM?= =?us-ascii?Q?HXZkCmyWMAJNiG3QgKLmmRadKZ1yji4RaqDiKsPsmOsLk1gVp9yyVWMSO7gI?= =?us-ascii?Q?tyr0JzeazT9KPtqxwuCjSIy5Wavtj2frcpPiAXVIHkSohHQgLXv2ZdB+fSIq?= =?us-ascii?Q?PR2azmJmOtgH3T5IDiMRRUIazBZ5sx23KxQWpuQdWSbrf7zUPwCAKjakEpeW?= =?us-ascii?Q?LkIohu7Ib/VG/bA1C1nIZMxQRHI2OW6EcXelBUk4LvsbYJewTpntTzbLXXY8?= =?us-ascii?Q?68NNDqAWiaaMzdPvUC9Dl9Av6DGWgaRS4oVC8TbF/JLGg62QInfM2334gqTg?= =?us-ascii?Q?erMYPsiisjioDJvXfTYW+1/C5k4xOUrf7Tq2BDGJ2vrYEZ2cCUOQ7RYQqZXw?= =?us-ascii?Q?r5zSMlhnsq06mgGQ4KhABpGALD55uTqDvo0sq54eSY7jhHwgbj/vjrZJ8TXN?= =?us-ascii?Q?DxySH4M/5bZIG8ITRpL2yVwB/Ej1Kj2oET/QyywtRzaw/xopBBv97Nah+LXj?= =?us-ascii?Q?Vw7kw8OkzkXwYeL2icT9a/DezI3jxs9ZBIIg0QpfAm0WimeGmDGeNjoGKBxd?= =?us-ascii?Q?O0Q0sLsv1smUKhEyWiuFO8zLOZUcwebYEl28+T3zSASoj3eOt0OlbaA5GgXk?= =?us-ascii?Q?Pam2N6S66q6VwUUkZvTQQSztwCqvJ57iE2DP8eSMVWij4Q7T+cDP0uf1T39j?= =?us-ascii?Q?K0/lIykanDKjF6TpfsM77Do30ouL9I9EBFQADDeqX7bkH5FGJw=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(82310400026)(36860700013)(376014)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:55:56.3862 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8a2f6688-e54e-4c9c-35ab-08dcbace1b5e 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF00003F61.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8882 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=7a6c0e6212a2b74e1b3ea6c39672c93be8f63f3a Thanks. Xueming Li --- >From 7a6c0e6212a2b74e1b3ea6c39672c93be8f63f3a Mon Sep 17 00:00:00 2001 From: Eric Joyner Date: Tue, 25 Jun 2024 12:12:25 +0100 Subject: [PATCH] net/ice/base: fix memory leak in firmware version check Cc: Xueming Li [ upstream commit 6b75956aacc081d56a36ab8f82c530832b288c01 ] If ice_cfg_phy_fec() goes through case ICE_FEC_DIS_AUTO but the underlying device firmware isn't the correct version, then the memory used to hold the PHY capabilities output from the firmware isn't freed. Fix this by making sure the memory is freed by jumping to the label that frees the memory instead of returning from the version check immediately. Fixes: 4b6ede113f55 ("net/ice/base: support auto FEC with FEC disabled") Signed-off-by: Eric Joyner Signed-off-by: Ian Stokes Acked-by: Bruce Richardson --- drivers/net/ice/base/ice_common.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/base/ice_common.c b/drivers/net/ice/base/ice_common.c index 8867279c28..dcf008175e 100644 --- a/drivers/net/ice/base/ice_common.c +++ b/drivers/net/ice/base/ice_common.c @@ -3890,8 +3890,10 @@ ice_cfg_phy_fec(struct ice_port_info *pi, struct ice_aqc_set_phy_cfg_data *cfg, break; case ICE_FEC_DIS_AUTO: /* Set No FEC and auto FEC */ - if (!ice_fw_supports_fec_dis_auto(hw)) - return ICE_ERR_NOT_SUPPORTED; + if (!ice_fw_supports_fec_dis_auto(hw)) { + status = ICE_ERR_NOT_SUPPORTED; + goto out; + } cfg->link_fec_opt |= ICE_AQC_PHY_FEC_DIS; /* fall-through */ case ICE_FEC_AUTO: -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:04.259234461 +0800 +++ 0052-net-ice-base-fix-memory-leak-in-firmware-version-che.patch 2024-08-12 20:44:02.065069289 +0800 @@ -1 +1 @@ -From 6b75956aacc081d56a36ab8f82c530832b288c01 Mon Sep 17 00:00:00 2001 +From 7a6c0e6212a2b74e1b3ea6c39672c93be8f63f3a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 6b75956aacc081d56a36ab8f82c530832b288c01 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 3d787d2a29..ef6696cddf 100644 +index 8867279c28..dcf008175e 100644 @@ -28 +30 @@ -@@ -3843,8 +3843,10 @@ ice_cfg_phy_fec(struct ice_port_info *pi, struct ice_aqc_set_phy_cfg_data *cfg, +@@ -3890,8 +3890,10 @@ ice_cfg_phy_fec(struct ice_port_info *pi, struct ice_aqc_set_phy_cfg_data *cfg,