]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
perf stat: Fix affinity memory leaks on error path
authorIan Rogers <irogers@google.com>
Tue, 1 Oct 2024 05:23:24 +0000 (22:23 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2024 12:53:46 +0000 (13:53 +0100)
[ Upstream commit 7f6ccb70e465bd8c9cf8973aee1c01224e4bdb3c ]

Missed cleanup when an error occurs.

Fixes: 49de179577e7 ("perf stat: No need to setup affinities when starting a workload")
Signed-off-by: Ian Rogers <irogers@google.com>
Link: https://lore.kernel.org/r/20241001052327.7052-2-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/perf/builtin-stat.c

index d0cbd1477dfcc76632985fd1ba4a04699dc484ab..668a8ad2bf604f0cc9a5ebfdf68e5e42b5e2db5e 100644 (file)
@@ -823,6 +823,7 @@ try_again_reset:
                }
        }
        affinity__cleanup(affinity);
+       affinity = NULL;
 
        evlist__for_each_entry(evsel_list, counter) {
                if (!counter->supported) {
@@ -961,6 +962,7 @@ err_out:
        if (forks)
                evlist__cancel_workload(evsel_list);
 
+       affinity__cleanup(affinity);
        return err;
 }