1 files changed, 15 insertions, 10 deletions

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 912fedc5b42d..c88f9f215e6f 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -1653,15 +1653,17 @@ static int trace__vfs_getname(struct trace *trace, struct perf_evsel *evsel,
 
         ttrace = thread__priv(thread);
         if (!ttrace)
-                goto out;
+                goto out_put;
 
         filename_len = strlen(filename);
+        if (filename_len == 0)
+                goto out_put;
 
         if (ttrace->filename.namelen < filename_len) {
                 char *f = realloc(ttrace->filename.name, filename_len + 1);
 
                 if (f == NULL)
-                                goto out;
+                        goto out_put;
 
                 ttrace->filename.namelen = filename_len;
                 ttrace->filename.name = f;
@@ -1671,12 +1673,12 @@ static int trace__vfs_getname(struct trace *trace, struct perf_evsel *evsel,
         ttrace->filename.pending_open = true;
 
         if (!ttrace->filename.ptr)
-                goto out;
+                goto out_put;
 
         entry_str_len = strlen(ttrace->entry_str);
         remaining_space = trace__entry_str_size - entry_str_len - 1; /* \0 */
         if (remaining_space <= 0)
-                goto out;
+                goto out_put;
 
         if (filename_len > (size_t)remaining_space) {
                 filename += filename_len - remaining_space;
@@ -1690,6 +1692,8 @@ static int trace__vfs_getname(struct trace *trace, struct perf_evsel *evsel,
 
         ttrace->filename.ptr = 0;
         ttrace->filename.entry_str_pos = 0;
+out_put:
+        thread__put(thread);
 out:
         return 0;
 }
@@ -1710,6 +1714,7 @@ static int trace__sched_stat_runtime(struct trace *trace, struct perf_evsel *evs
 
         ttrace->runtime_ms += runtime_ms;
         trace->runtime_ms += runtime_ms;
+out_put:
         thread__put(thread);
         return 0;
 
@@ -1720,8 +1725,7 @@ out_dump:
                (pid_t)perf_evsel__intval(evsel, sample, "pid"),
                runtime,
                perf_evsel__intval(evsel, sample, "vruntime"));
-        thread__put(thread);
-        return 0;
+        goto out_put;
 }
 
 static void bpf_output__printer(enum binary_printer_ops op,
@@ -1920,7 +1924,7 @@ static int trace__process_sample(struct perf_tool *tool,
 
         thread = machine__findnew_thread(trace->host, sample->pid, sample->tid);
         if (thread && thread__is_filtered(thread))
-                return 0;
+                goto out;
 
         trace__set_base_time(trace, evsel, sample);
 
@@ -1928,7 +1932,8 @@ static int trace__process_sample(struct perf_tool *tool,
                 ++trace->nr_events;
                 handler(trace, evsel, event, sample);
         }
-
+out:
+        thread__put(thread);
         return err;
 }
 
@@ -1988,7 +1993,7 @@ static int trace__record(struct trace *trace, int argc, const char **argv)
         for (i = 0; i < (unsigned int)argc; i++)
                 rec_argv[j++] = argv[i];
 
-        return cmd_record(j, rec_argv, NULL);
+        return cmd_record(j, rec_argv);
 }
 
 static size_t trace__fprintf_thread_summary(struct trace *trace, FILE *fp);
@@ -2786,7 +2791,7 @@ out:
         return err;
 }
 
-int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused)
+int cmd_trace(int argc, const char **argv)
 {
         const char *trace_usage[] = {
                 "perf trace [<options>] [<command>]",