]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ACPI: tools: pfrut: fix memory leak and resource leak in pfrut.c
authorMalaya Kumar Rout <mrout@redhat.com>
Thu, 20 Nov 2025 16:59:58 +0000 (22:29 +0530)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 24 Nov 2025 19:50:15 +0000 (20:50 +0100)
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>
Link: https://patch.msgid.link/20251120170001.251968-1-mrout@redhat.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
tools/power/acpi/tools/pfrut/pfrut.c

index 44a9ecbd91e88376d900943a4751ca528f97d5bc..4d9b0177c312a311697119d7894b983ff632adec 100644 (file)
@@ -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;
                }