summaryrefslogtreecommitdiffstats
path: root/tools/power
diff options
context:
space:
mode:
authorHao Zeng <zenghao@kylinos.cn>2023-04-18 09:30:56 +0800
committerShuah Khan <skhan@linuxfoundation.org>2023-05-08 08:11:24 -0600
commite652be0f59d4ba4d5c636b1f7f4dcb73aae049fa (patch)
treed511b59633d2d7e50f53baeb9ab5bded66425b64 /tools/power
parentac9a78681b921877518763ba0e89202254349d1b (diff)
downloadlinux-stable-e652be0f59d4ba4d5c636b1f7f4dcb73aae049fa.tar.gz
linux-stable-e652be0f59d4ba4d5c636b1f7f4dcb73aae049fa.tar.bz2
linux-stable-e652be0f59d4ba4d5c636b1f7f4dcb73aae049fa.zip
cpupower:Fix resource leaks in sysfs_get_enabled()
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> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Diffstat (limited to 'tools/power')
-rw-r--r--tools/power/cpupower/lib/powercap.c23
1 files changed, 16 insertions, 7 deletions
diff --git a/tools/power/cpupower/lib/powercap.c b/tools/power/cpupower/lib/powercap.c
index 0ce29ee4c2e4..a7a59c6bacda 100644
--- a/tools/power/cpupower/lib/powercap.c
+++ b/tools/power/cpupower/lib/powercap.c
@@ -40,25 +40,34 @@ static int sysfs_get_enabled(char *path, int *mode)
{
int fd;
char yes_no;
+ int ret = 0;
*mode = 0;
fd = open(path, O_RDONLY);
- if (fd == -1)
- return -1;
+ if (fd == -1) {
+ ret = -1;
+ goto out;
+ }
if (read(fd, &yes_no, 1) != 1) {
- close(fd);
- return -1;
+ ret = -1;
+ goto out_close;
}
if (yes_no == '1') {
*mode = 1;
- return 0;
+ goto out_close;
} else if (yes_no == '0') {
- return 0;
+ goto out_close;
+ } else {
+ ret = -1;
+ goto out_close;
}
- return -1;
+out_close:
+ close(fd);
+out:
+ return ret;
}
int powercap_get_enabled(int *mode)