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 039CE4625C for ; Tue, 18 Feb 2025 13:43:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F07D5402E5; Tue, 18 Feb 2025 13:43:34 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2054.outbound.protection.outlook.com [40.107.220.54]) by mails.dpdk.org (Postfix) with ESMTP id E20D9402A0 for ; Tue, 18 Feb 2025 13:43:33 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xC4NkpeRj1Aq3Dlfxw95G6BCvrRbsTCC787vz6tuz8Odi5/n1oY1zEu/gBpjSOramX8+lAJzKClDgIFIsPs0wYvc2Xmh0K3HMw25Q5K7ZKT3U+4A1EcDtlnl5z66OM/q2hUSvEcwChDUkI61HT6Qjkx6aCOWYAbMqkNxjCryQ4D7Q2jO7i2gg3f1OjU+5SEaIB/Us5KNtrStUJGbu9jQs0iuEPnMmiBnJdVjClWJ19QnNDDuH4E3+quBkI07JXXmUAcpfZx9FDn1UsTgNFHW2huBDOIHrEFV6s2xcW5EZRl2nMC4ZIpZzhmKBbMv1Kb9Lb+RATgJL3mhvQPFkef7FA== 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=cPSlVTXKtj/37CMTJX2gGsmCmWJMU2wAlzg1zMABVHE=; b=Tg4kG0A84N1M1encnz6nYEJzlPZDeYQYWVHKwFi0QtoOrgjP8yfXDUrBS43vKNTgZnPUfBKVcdMsMyz0sEAoxudWSG2KRTFmNyJFmYhYXVwCBdJhByTl9dOFuJXvx/+71dOW0dtXWkq+ATgMbYQpMXF/dRRwdpjcvxyeG9hIRQKVkBfuYfkAGe24oLDgNqn5qp/bCfv42IHQQ27j5k6CDX2+fUmJpSdnx/5ji4vlLFgnIBfUgYzLOSC/8kkmPMGW3eCrKUq4zkToaUEflFxQCdWPSI1PG/RkyaBkyTEy68ts8ikqfsHiIVApmcmWHp0Dh5clk8JINFGQGtKJrDdanQ== 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=cPSlVTXKtj/37CMTJX2gGsmCmWJMU2wAlzg1zMABVHE=; b=bfRLiGXefiinIqRrBdfIU7KuHN4h/ME3yhp+4Zf+QXl8bEz6U+s2w+0DNZs6VRPDODx5DM5Qbo3XFhDmlLX3x9sW3nxlsc+GeyaUk5VRntyHio2YxPEhgl4lR8kXW4EyRioRHDkd2bEqlXAgPYhhr4pE6i5Q6fZTQZz0zNXo7VTW19p+0URGVh82maUnF8NcR+oMS6lgfGe11TIRf8dk0K7qIQF6z0MA0/T/HmhX8XjXVfMNGN6liqHrlzL7Rnd2h//uD688BBUi6P7/KhcbPaRAWgwg7JqPc9Y26S9NRhaqROIBKQ0IZteAQp2azPFBKjBsfYJJkRblEXZyRxK3RA== Received: from BY5PR17CA0056.namprd17.prod.outlook.com (2603:10b6:a03:167::33) by DM4PR12MB8499.namprd12.prod.outlook.com (2603:10b6:8:181::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Tue, 18 Feb 2025 12:43:28 +0000 Received: from SJ1PEPF00002323.namprd03.prod.outlook.com (2603:10b6:a03:167:cafe::81) by BY5PR17CA0056.outlook.office365.com (2603:10b6:a03:167::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.18 via Frontend Transport; Tue, 18 Feb 2025 12:43:27 +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 SJ1PEPF00002323.mail.protection.outlook.com (10.167.242.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:43:27 +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, 18 Feb 2025 04:43:18 -0800 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; Tue, 18 Feb 2025 04:43:16 -0800 From: Xueming Li To: Stephen Hemminger CC: , dpdk stable Subject: patch 'raw/cnxk_gpio: fix file descriptor leak' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:35:10 +0800 Message-ID: <20250218123523.36836-76-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-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: SJ1PEPF00002323:EE_|DM4PR12MB8499:EE_ X-MS-Office365-Filtering-Correlation-Id: dfc7a574-812e-44e2-8c5d-08dd5019d792 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|1800799024|376014|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?TnMwZJIy2LI+Rfwluy1rX4OIPHFqOehktlt2uyuNa3bLULgSBTLKfRnc8ds7?= =?us-ascii?Q?Xmci1s/qRTsc1aLWgGotjgYlAgBlT/PAIqsVE7MEaroTWMZiwV8IpFDKlIWP?= =?us-ascii?Q?sQCePzxjABvypYapp+Gvaw2j7kOCrs4VWiqntt5LufpeOs7am3qq7gM95bhF?= =?us-ascii?Q?RHAUvk8aanSDOv1tL+v4XIr1qYPnPXvSusxfTi0MLPYukaLKGSKe1YatQiH/?= =?us-ascii?Q?MVNeiX5K9H/6T7nLaFsAT7X2F79wUuS+d+gP5uLOXf5F/qYS0S3QgXYN8tOY?= =?us-ascii?Q?xds07vxSadRZkcITR6qbOXUMPg3YZWoxtceHlntlVEc4cVWT5xtaxPDt9zRF?= =?us-ascii?Q?BrDLCTKrazM/k21wAl6MgfrLtqg6+WwNi+GJv6L5R8aowob5p51M5XPLE8ag?= =?us-ascii?Q?H0bxjBm4ocg1deM/fRAbomYlgO3hVp1uSWAjQWdNIORHs+rI8ltp8hQxnGQv?= =?us-ascii?Q?cRXzlK5eT4ctS+NH/xc1VlrXDbI6lq0z+bzw4HQ13ZP49h3oNhDiGvJdLAua?= =?us-ascii?Q?50L2Rt7T2Z7Sa0lDsyQxtBUOets6n2q0OrEjYRVUmvfHT3cRuPoS86NhqccN?= =?us-ascii?Q?oQFq4PHR0FvUZgWtxKHspOWQK517r1ENvCxLnn+InkC3LqkGX6nDk2aaos3y?= =?us-ascii?Q?KrdULra5ZLQsTi6JIZhN7Q5E5c3xOllTvfSDGdutaDRGchUF/mOQVuf24Slf?= =?us-ascii?Q?Halt2TPTCKuYc5v7JhCGFzaGbNnWXpQQ3DTlMbVvEcb4vIg+RGnj5Z7by1ND?= =?us-ascii?Q?dPnpiGGElw/s5lp2x6iOlE6s/Obmz6N8taNb3OochiH+nJm5r8YXpnJ6uvid?= =?us-ascii?Q?bEEZ4LaLBRLsztaBgMyT8Q5yASmb+WV2HO2T20uD3wwCo0SByjeS7yGpJa7b?= =?us-ascii?Q?hL+I4anqEHJ6IkKKtbKwuHgKwkpb/Uw3oqU1Yx9JBcBkEVPJTpgHhGjtfh89?= =?us-ascii?Q?X8EppJe5Pp5xRp7mhnHetCoe5L4HH3v8L8om7w09VrpxzxxGCSldBOe0NWtf?= =?us-ascii?Q?EuJQXOJegQys8rcgpdGHd0fTqTYudd2ATYuPKSbq9yCHTSeH38RWt1+xeo1q?= =?us-ascii?Q?RGSQ75t9IPFjXCznwkMWcwD4EvqxAuBPhAePWuhA3Nr4VOgfZcNEKbhZh3V2?= =?us-ascii?Q?HAyUigzF+4cqFlQaj9GehTutAejREGauqVS+fjEXwwM/30S9QsrS/njr7yzu?= =?us-ascii?Q?87+crB9R0in99OAZHF5n2GIUdZ0++WDzSz3g9gIHT0hHa/uc1JVWCUL3M4p+?= =?us-ascii?Q?UaDx+M58q6mfp/Mpdc//KNpxQR3IQWHKhChNtJGaZ4NUl/QW25oceOuyeMb4?= =?us-ascii?Q?PxitC4wpL43lnIRkP6B3QfiqugvXTJD/ce3qS2XEpIoUWMhKcKtBzSKaiw+Y?= =?us-ascii?Q?yjVDbyJDjQckcoyP0kH8XE+B5BQxLvxrcs22q6r1GY5XoDKGmMH63m0evuCM?= =?us-ascii?Q?Tp0edyIZeviHhMvdtwtyIyW2IFu/S9zAHb/mpXO8tnQnvYm/ygf/1rZFWv7G?= =?us-ascii?Q?OuwWpCfPlT4aTeE=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)(36860700013)(1800799024)(376014)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:43:27.7276 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dfc7a574-812e-44e2-8c5d-08dd5019d792 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: SJ1PEPF00002323.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB8499 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. 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=377196266e55301379293a097d1b864b5d48819c Thanks. Xueming Li --- >From 377196266e55301379293a097d1b864b5d48819c Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Feb 2025 08:23:04 -0800 Subject: [PATCH] raw/cnxk_gpio: fix file descriptor leak Cc: Xueming Li [ upstream commit 67f0beaf0f5bf2cf239219c737ed8d93aaaaa673 ] The function would leak file if fscanf failed. There is a working version in other file, clone that. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Fixes: 0e6557b448fa ("raw/cnxk_gpio: add self test") Signed-off-by: Stephen Hemminger --- drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c b/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c index 10742b5dc4..907535c08e 100644 --- a/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c +++ b/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c @@ -34,24 +34,30 @@ cnxk_gpio_attr_exists(const char *attr) static int cnxk_gpio_read_attr(char *attr, char *val) { + int ret, ret2; FILE *fp; - int ret; fp = fopen(attr, "r"); if (!fp) return -errno; ret = fscanf(fp, "%s", val); - if (ret < 0) - return -errno; - if (ret != 1) - return -EIO; + if (ret < 0) { + ret = -errno; + goto out; + } + if (ret != 1) { + ret = -EIO; + goto out; + } - ret = fclose(fp); - if (ret) - return -errno; + ret = 0; +out: + ret2 = fclose(fp); + if (!ret) + ret = ret2; - return 0; + return ret; } #define CNXK_GPIO_ERR_STR(err, str, ...) do { \ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:03.319039184 +0800 +++ 0075-raw-cnxk_gpio-fix-file-descriptor-leak.patch 2025-02-18 19:39:00.708244034 +0800 @@ -1 +1 @@ -From 67f0beaf0f5bf2cf239219c737ed8d93aaaaa673 Mon Sep 17 00:00:00 2001 +From 377196266e55301379293a097d1b864b5d48819c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 67f0beaf0f5bf2cf239219c737ed8d93aaaaa673 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 2f3973a7b5..a0d9942f20 100644 +index 10742b5dc4..907535c08e 100644