[PATCH v1] perf trace: Fix some more memory leaks

Ian Rogers posted 1 patch 1 week, 1 day ago
tools/perf/builtin-trace.c | 3 ++-
tools/perf/util/thread.c   | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
[PATCH v1] perf trace: Fix some more memory leaks
Posted by Ian Rogers 1 week, 1 day ago
The files.max is the maximum valid fd in the files array and so
freeing the values needs to be inclusive of the max value.

Add missing thread__put of the found parent thread in
thread__e_machine.

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/builtin-trace.c | 3 ++-
 tools/perf/util/thread.c   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 58a2ce3ff2db..c02ea4e8b270 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -1657,7 +1657,7 @@ static const size_t trace__entry_str_size = 2048;
 
 static void thread_trace__free_files(struct thread_trace *ttrace)
 {
-	for (int i = 0; i < ttrace->files.max; ++i) {
+	for (int i = 0; i <= ttrace->files.max; ++i) {
 		struct file *file = ttrace->files.table + i;
 		zfree(&file->pathname);
 	}
@@ -1703,6 +1703,7 @@ static int trace__set_fd_pathname(struct thread *thread, int fd, const char *pat
 
 	if (file != NULL) {
 		struct stat st;
+
 		if (stat(pathname, &st) == 0)
 			file->dev_maj = major(st.st_rdev);
 		file->pathname = strdup(pathname);
diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
index 89585f53c1d5..415c0e5d1e75 100644
--- a/tools/perf/util/thread.c
+++ b/tools/perf/util/thread.c
@@ -471,6 +471,7 @@ uint16_t thread__e_machine(struct thread *thread, struct machine *machine)
 
 		if (parent) {
 			e_machine = thread__e_machine(parent, machine);
+			thread__put(parent);
 			thread__set_e_machine(thread, e_machine);
 			return e_machine;
 		}
-- 
2.49.0.504.g3bcea36a83-goog
Re: [PATCH v1] perf trace: Fix some more memory leaks
Posted by Howard Chu 1 week, 1 day ago
Hello Ian,

On Tue, Apr 1, 2025 at 1:27 PM Ian Rogers <irogers@google.com> wrote:
>
> The files.max is the maximum valid fd in the files array and so
> freeing the values needs to be inclusive of the max value.
>
> Add missing thread__put of the found parent thread in
> thread__e_machine.
>
> Signed-off-by: Ian Rogers <irogers@google.com>

Reviewed-by: Howard Chu <howardchu95@gmail.com>

Thanks,
Howard