]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
perf sched timehist: Fix missing free of session in perf_sched__timehist()
authorYang Jihong <yangjihong@bytedance.com>
Tue, 6 Aug 2024 02:35:33 +0000 (10:35 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 Oct 2024 14:33:00 +0000 (16:33 +0200)
[ Upstream commit 6bdf5168b6fb19541b0c1862bdaa596d116c7bfb ]

When perf_time__parse_str() fails in perf_sched__timehist(),
need to free session that was previously created, fix it.

Fixes: 853b74071110bed3 ("perf sched timehist: Add option to specify time window of interest")
Signed-off-by: Yang Jihong <yangjihong@bytedance.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: David Ahern <dsa@cumulusnetworks.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20240806023533.1316348-1-yangjihong@bytedance.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/perf/builtin-sched.c

index 5977c49ae2c76beabc57ee830fb6bde106a9d4b2..bb173de7165785b54a54a8ab2d238efffebaa199 100644 (file)
@@ -3031,7 +3031,8 @@ static int perf_sched__timehist(struct perf_sched *sched)
 
        if (perf_time__parse_str(&sched->ptime, sched->time_str) != 0) {
                pr_err("Invalid time string\n");
-               return -EINVAL;
+               err = -EINVAL;
+               goto out;
        }
 
        if (timehist_check_attr(sched, evlist) != 0)