]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
perf data: Fix double free in perf_session__delete()
authorAlexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Fri, 18 Feb 2022 15:23:41 +0000 (18:23 +0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 22 Feb 2022 20:34:16 +0000 (17:34 -0300)
commit69560e366fc4d5fca7bebb0e44edbfafc8bcaf05
tree1142b8bbfca061df8df4532f38b1cb6fbba9e090
parent8a3d2ee0de3828e0d01f9682d35ee53704659bd0
perf data: Fix double free in perf_session__delete()

When perf_data__create_dir() fails, it calls close_dir(), but
perf_session__delete() also calls close_dir() and since dir.version and
dir.nr were initialized by perf_data__create_dir(), a double free occurs.

This patch moves the initialization of dir.version and dir.nr after
successful initialization of dir.files, that prevents double freeing.
This behavior is already implemented in perf_data__open_dir().

Fixes: 145520631130bd64 ("perf data: Add perf_data__(create_dir|close_dir) functions")
Signed-off-by: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Antonov <alexander.antonov@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexei Budankov <abudankov@huawei.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220218152341.5197-2-alexey.v.bayduraev@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/data.c