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 24BA34624E for ; Mon, 17 Feb 2025 18:08:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1FBB1400EF; Mon, 17 Feb 2025 18:08:21 +0100 (CET) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id 64CBF402BB for ; Mon, 17 Feb 2025 18:08:20 +0100 (CET) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-43962f7b0e4so27905675e9.3 for ; Mon, 17 Feb 2025 09:08:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812100; x=1740416900; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hREWM3+QN8GZXmRbNb9hM2TJ0DgUSWEbO4Zbpv2gQfA=; b=TnDOEXbKFsVdUZADJRegNmTYzdYqDkWk+8vNXlvXuiTuvg0RTLu/MIf53GRK0Bqj8a AOaEA2seS74tCu4X126WOIcEuJfMiFC2e4zRkL9qQxLmr+KKb0AA2r3bHhw1cTIaRieB 1x96WO94pbFySW5+rdHchWIbpSlnDiWQh0k+NQ29qkYNwdKx0AfRmAvxCc8qae6Kc8Ht lMgGi6Xv8c3zeWc8kt/UgElSkRSOGdamd1CfN89EzB6pdduicIQOJtYcXA9E1eGcTUL2 5kR+B9IlgxN7BxLwTPCIliFVVpn/wqwEYFaoiwXC2HIETawsWcfnMQr33OwUnhJzDJ5y M7lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812100; x=1740416900; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hREWM3+QN8GZXmRbNb9hM2TJ0DgUSWEbO4Zbpv2gQfA=; b=qp1VOaDu2dEQk1gFnWNiB+4G1zdYuXd4UVlxlCcHQh5cETUhE/K9uJZVxsGciVH/zL p6KcDQZlp85kBnuUTJ/12qyXaBfQqqi//ldXRVedIPfDwKnztXKHPyqT1DMlOFzDtFSU TCtkfB7vKVYMWTSA6rU7Qz49wdz9RIPgrPEuR33no6dYW1avJzdjDkOe5Zb4dh+lwtkA 0eDo2AsmzC3JJp+Um3p5r1UV3yovb06qeMan7TEZfDy2D6PSM/n9pgl+2r59UC8liX3E PT/GAQltIgv1Krsmj2XPSDkwN7E5c9UTcQrj7F/R8yj+ObgqjL2CIL4yo9G4MAs5OEKX zAhQ== X-Gm-Message-State: AOJu0YzCUW4k+YmFclDsVXeHE9p+jusz9xRhldEpVGbBWW2bez07NUQj LjUQB/ff8Rm6kjAiKWuX6T5M5cKsulS9hCVoDyyIa3JglbvBcjlO2AAf+OF/X9vi3w== X-Gm-Gg: ASbGncsQmo430kaS/rXT0xkDR5zqtbsN9X1qH4pWIk4KIp02UHnI50HVq+SyCi4NqHI 6/gok2vfMcUxSelmkX5XOx9ZuctLH4mpc1niow/AB/edf3cNspw/bH9ttTM3yJYG/cZ1qXlhHgj X974BHpUHIR2l255q7vv9/79VrPPKgmHyLMhaXGvzUyn7iu1Inq/cQ2BgolX7wu7Iz0EbLUN3hR AFlptnwvh3bGLC5hZU82+OsF1qK2pBS7fV/fUiXnVDY5oihz2zTkYX7bSz1MvWoS9sNYOq3EEJr SVCR9a8bQJ0gNA8vB47LpQ== X-Google-Smtp-Source: AGHT+IFPJ1Dgog3kvLDOIo2b6BbSsErIiPxuI593UuVgbCzVkJFvvk2B25SNlwWfuAqwWc4J+wE5FQ== X-Received: by 2002:a05:600c:a014:b0:439:8340:637 with SMTP id 5b1f17b1804b1-439861fdba3mr33346345e9.30.1739812099874; Mon, 17 Feb 2025 09:08:19 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4398c9deb59sm15026005e9.32.2025.02.17.09.08.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:08:19 -0800 (PST) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: dpdk stable Subject: patch 'raw/cnxk_gpio: fix file descriptor leak' has been queued to stable release 22.11.8 Date: Mon, 17 Feb 2025 17:04:36 +0000 Message-ID: <20250217170456.1068278-63-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.8 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/19/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/84163aa605d60776c13e7c1ce056eabedfa122bd Thanks. Luca Boccassi --- >From 84163aa605d60776c13e7c1ce056eabedfa122bd 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 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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:19.066097518 +0000 +++ 0063-raw-cnxk_gpio-fix-file-descriptor-leak.patch 2025-02-17 16:13:16.858441592 +0000 @@ -1 +1 @@ -From 67f0beaf0f5bf2cf239219c737ed8d93aaaaa673 Mon Sep 17 00:00:00 2001 +From 84163aa605d60776c13e7c1ce056eabedfa122bd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 67f0beaf0f5bf2cf239219c737ed8d93aaaaa673 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 2f3973a7b5..a0d9942f20 100644 +index 10742b5dc4..907535c08e 100644