* [PATCH] ACPI: tools: pfrut: fix memory leak and resource leak in pfrut.c
@ 2025-11-20 16:59 Malaya Kumar Rout
2025-11-24 19:51 ` Rafael J. Wysocki
0 siblings, 1 reply; 2+ messages in thread
From: Malaya Kumar Rout @ 2025-11-20 16:59 UTC (permalink / raw)
To: linux-kernel
Cc: mrout, lyude, malayarout91, Rafael J. Wysocki, Len Brown,
Robert Moore, linux-acpi, acpica-devel
Static analysis found an issue in pfrut.c
cppcheck output before this patch:
tools/power/acpi/tools/pfrut/pfrut.c:225:3: error: Resource leak: fd_update [resourceLeak]
tools/power/acpi/tools/pfrut/pfrut.c:269:3: error: Resource leak: fd_update [resourceLeak]
tools/power/acpi/tools/pfrut/pfrut.c:269:3: error: Resource leak: fd_update_log [resourceLeak]
tools/power/acpi/tools/pfrut/pfrut.c:365:4: error: Memory leak: addr_map_capsule [memleak]
tools/power/acpi/tools/pfrut/pfrut.c:424:4: error: Memory leak: log_buf [memleak]
cppcheck output after this patch:
No resource leaks found
Fix by closing file descriptors and freeing allocated memory.
Signed-off-by: Malaya Kumar Rout <mrout@redhat.com>
---
tools/power/acpi/tools/pfrut/pfrut.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/power/acpi/tools/pfrut/pfrut.c b/tools/power/acpi/tools/pfrut/pfrut.c
index 44a9ecbd91e8..4d9b0177c312 100644
--- a/tools/power/acpi/tools/pfrut/pfrut.c
+++ b/tools/power/acpi/tools/pfrut/pfrut.c
@@ -222,6 +222,7 @@ int main(int argc, char *argv[])
fd_update_log = open("/dev/acpi_pfr_telemetry0", O_RDWR);
if (fd_update_log < 0) {
printf("PFRT device not supported - Quit...\n");
+ close(fd_update);
return 1;
}
@@ -265,7 +266,8 @@ int main(int argc, char *argv[])
printf("chunk2_size:%d\n", data_info.chunk2_size);
printf("rollover_cnt:%d\n", data_info.rollover_cnt);
printf("reset_cnt:%d\n", data_info.reset_cnt);
-
+ close(fd_update);
+ close(fd_update_log);
return 0;
}
@@ -358,6 +360,7 @@ int main(int argc, char *argv[])
if (ret == -1) {
perror("Failed to load capsule file");
+ munmap(addr_map_capsule, st.st_size);
close(fd_capsule);
close(fd_update);
close(fd_update_log);
@@ -420,7 +423,7 @@ int main(int argc, char *argv[])
if (p_mmap == MAP_FAILED) {
perror("mmap error.");
close(fd_update_log);
-
+ free(log_buf);
return 1;
}
--
2.51.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ACPI: tools: pfrut: fix memory leak and resource leak in pfrut.c
2025-11-20 16:59 [PATCH] ACPI: tools: pfrut: fix memory leak and resource leak in pfrut.c Malaya Kumar Rout
@ 2025-11-24 19:51 ` Rafael J. Wysocki
0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2025-11-24 19:51 UTC (permalink / raw)
To: Malaya Kumar Rout
Cc: linux-kernel, lyude, malayarout91, Rafael J. Wysocki, Len Brown,
Robert Moore, linux-acpi, acpica-devel
On Thu, Nov 20, 2025 at 6:00 PM Malaya Kumar Rout <mrout@redhat.com> wrote:
>
> Static analysis found an issue in pfrut.c
>
> cppcheck output before this patch:
> tools/power/acpi/tools/pfrut/pfrut.c:225:3: error: Resource leak: fd_update [resourceLeak]
> tools/power/acpi/tools/pfrut/pfrut.c:269:3: error: Resource leak: fd_update [resourceLeak]
> tools/power/acpi/tools/pfrut/pfrut.c:269:3: error: Resource leak: fd_update_log [resourceLeak]
> tools/power/acpi/tools/pfrut/pfrut.c:365:4: error: Memory leak: addr_map_capsule [memleak]
> tools/power/acpi/tools/pfrut/pfrut.c:424:4: error: Memory leak: log_buf [memleak]
>
> cppcheck output after this patch:
> No resource leaks found
>
> Fix by closing file descriptors and freeing allocated memory.
>
> Signed-off-by: Malaya Kumar Rout <mrout@redhat.com>
> ---
> tools/power/acpi/tools/pfrut/pfrut.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/tools/power/acpi/tools/pfrut/pfrut.c b/tools/power/acpi/tools/pfrut/pfrut.c
> index 44a9ecbd91e8..4d9b0177c312 100644
> --- a/tools/power/acpi/tools/pfrut/pfrut.c
> +++ b/tools/power/acpi/tools/pfrut/pfrut.c
> @@ -222,6 +222,7 @@ int main(int argc, char *argv[])
> fd_update_log = open("/dev/acpi_pfr_telemetry0", O_RDWR);
> if (fd_update_log < 0) {
> printf("PFRT device not supported - Quit...\n");
> + close(fd_update);
> return 1;
> }
>
> @@ -265,7 +266,8 @@ int main(int argc, char *argv[])
> printf("chunk2_size:%d\n", data_info.chunk2_size);
> printf("rollover_cnt:%d\n", data_info.rollover_cnt);
> printf("reset_cnt:%d\n", data_info.reset_cnt);
> -
> + close(fd_update);
> + close(fd_update_log);
> return 0;
> }
>
> @@ -358,6 +360,7 @@ int main(int argc, char *argv[])
>
> if (ret == -1) {
> perror("Failed to load capsule file");
> + munmap(addr_map_capsule, st.st_size);
> close(fd_capsule);
> close(fd_update);
> close(fd_update_log);
> @@ -420,7 +423,7 @@ int main(int argc, char *argv[])
> if (p_mmap == MAP_FAILED) {
> perror("mmap error.");
> close(fd_update_log);
> -
> + free(log_buf);
> return 1;
> }
>
> --
Applied as 6.19 material, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-11-24 19:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-20 16:59 [PATCH] ACPI: tools: pfrut: fix memory leak and resource leak in pfrut.c Malaya Kumar Rout
2025-11-24 19:51 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox