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 B417A46211 for ; Thu, 13 Feb 2025 11:03:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AFA1342F35; Thu, 13 Feb 2025 11:03:55 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 12D3942F35 for ; Thu, 13 Feb 2025 11:03:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739441033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3Ia04MdhbsFXed7f8F5Mf8QRgfBi89wHuNhAi/u1zKk=; b=fBvPzSWbkJp1PgWFDjGorm0gQL4E4AH/tgZasLWt4lxagRklJfIvCrR7fHCj7/VF3edU7X Cemk8VqqO4qM4OcB/UiWm8EHPf80QX1KhHS9odnkKePSoP48USjLeZQQJdzn9s8OwYwTrS FUGtXkhO6xgvooFdofKa+vgwapW/wcg= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-441-iLrl3MQXM8uxnMyGc7v3jg-1; Thu, 13 Feb 2025 05:03:50 -0500 X-MC-Unique: iLrl3MQXM8uxnMyGc7v3jg-1 X-Mimecast-MFC-AGG-ID: iLrl3MQXM8uxnMyGc7v3jg Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8598C19783B7; Thu, 13 Feb 2025 10:03:49 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4EB1E1800570; Thu, 13 Feb 2025 10:03:48 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Subject: patch 'raw/cnxk_gpio: fix file descriptor leak' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:59:13 +0000 Message-ID: <20250213095933.362078-106-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: MkVQY-GJd7OmEe2Jc3RNmnotlBFTgzT0OcJQKeMwvwQ_1739441029 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.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 02/17/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/630bb8e5d0b03939bca565d61341058463e14827 Thanks. Kevin --- >From 630bb8e5d0b03939bca565d61341058463e14827 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 [ 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 2f3973a7b5..a0d9942f20 100644 --- a/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c +++ b/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c @@ -35,6 +35,6 @@ static int cnxk_gpio_read_attr(char *attr, char *val) { + int ret, ret2; FILE *fp; - int ret; fp = fopen(attr, "r"); @@ -43,14 +43,20 @@ cnxk_gpio_read_attr(char *attr, char *val) 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; } -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:45.726238643 +0000 +++ 0106-raw-cnxk_gpio-fix-file-descriptor-leak.patch 2025-02-12 17:29:34.617947523 +0000 @@ -1 +1 @@ -From 67f0beaf0f5bf2cf239219c737ed8d93aaaaa673 Mon Sep 17 00:00:00 2001 +From 630bb8e5d0b03939bca565d61341058463e14827 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 67f0beaf0f5bf2cf239219c737ed8d93aaaaa673 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org