Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Hao Zeng <zenghao@kylinos.cn>
To:     skhan@linuxfoundation.org
Cc:     trenn@suse.com, shuah@kernel.org, linux-pm@vger.kernel.org,
        linux-kernel@vger.kernel.org, zenghao@kylinos.cn
Subject: [PATCH v3] cpupower:Fix resource leaks in sysfs_get_enabled()
Date:   Mon, 17 Apr 2023 15:56:17 +0800
Message-Id: <20230417075617.10487-1-zenghao@kylinos.cn>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

The sysfs_get_enabled() opened file processor not closed,
may cause a file handle leak.
Putting error handling and resource cleanup code together
makes the code easy to maintain and read.
Removed the unnecessary else if branch from the original
function, as it should return an error in cases other than '0'.

Signed-off-by: Hao Zeng <zenghao@kylinos.cn>
Suggested-by: Shuah Khan <skhan@linuxfoundation.org>
---
 tools/power/cpupower/lib/powercap.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/tools/power/cpupower/lib/powercap.c b/tools/power/cpupower/l=
ib/powercap.c
index 0ce29ee4c2e4..f0334a5f1acf 100644
--- a/tools/power/cpupower/lib/powercap.c
+++ b/tools/power/cpupower/lib/powercap.c
@@ -40,25 +40,31 @@ static int sysfs_get_enabled(char *path, int *mode)
 {
 	int fd;
 	char yes_no;
+	int ret =3D 0;
=20
 	*mode =3D 0;
=20
 	fd =3D open(path, O_RDONLY);
-	if (fd =3D=3D -1)
-		return -1;
+	if (fd =3D=3D -1) {
+		ret =3D -1;
+		goto out;
+	}
=20
 	if (read(fd, &yes_no, 1) !=3D 1) {
-		close(fd);
-		return -1;
+		ret =3D -1;
+		goto out_close;
 	}
=20
 	if (yes_no =3D=3D '1') {
 		*mode =3D 1;
-		return 0;
-	} else if (yes_no =3D=3D '0') {
-		return 0;
+	} else if (yes_no !=3D '0') {
+		ret =3D -1;
+		goto out_close;
 	}
-	return -1;
+out_close:
+	close(fd);
+out:
+	return ret;
 }
=20
 int powercap_get_enabled(int *mode)
--=20
2.37.2