ACPI: tools: pfrut: fix memory leak and resource leak in pfrut.c
Subsystems (2)
PATCH 1/1 ACPI: tools: pfrut: fix memory leak and resource leak in pfrut.c
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.
--- tools/power/acpi/tools/pfrut/pfrut.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/power/acpi/tools/pfrut/pfrut.c +5 -2
@@ -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 ; }
Signature · 1 line
2.51.0
Quoted 51 lines · Malaya Kumar Rout
Static analysis found an issue in
pfrut.ccppcheck 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 foundFix by closing file descriptors and freeing allocated memory.
Signed-off-by Malaya Kumar Rout <[email protected]>--- tools/power/acpi/tools/pfrut/pfrut.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)tools/power/acpi/tools/pfrut/pfrut.c +4
-1@@ -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);
tools/power/acpi/tools/pfrut/pfrut.c int main(int argc, char *argv[])
Quoted 9 lines
tools/power/acpi/tools/pfrut/pfrut.c +1
-2@@ -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!