Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dffce58f authored by Alexey Bayduraev's avatar Alexey Bayduraev Committed by Greg Kroah-Hartman
Browse files

perf data: Fix double free in perf_session__delete() 



commit 69560e366fc4d5fca7bebb0e44edbfafc8bcaf05 upstream.

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: 14552063 ("perf data: Add perf_data__(create_dir|close_dir) functions")
Signed-off-by: default avatarAlexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Acked-by: default avatarJiri 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3174b09f

tools/perf/util/data.c

+3 −4
Original line number Diff line number Diff line
@@ -44,10 +44,6 @@ int perf_data__create_dir(struct perf_data *data, int nr) 
	if (!files)

		return -ENOMEM;



	data->dir.version = PERF_DIR_VERSION;

	data->dir.files   = files;

	data->dir.nr      = nr;



	for (i = 0; i < nr; i++) {

		struct perf_data_file *file = &files[i];
@@ -62,6 +58,9 @@ int perf_data__create_dir(struct perf_data *data, int nr) 
		file->fd = ret;

	}



	data->dir.version = PERF_DIR_VERSION;

	data->dir.files   = files;

	data->dir.nr      = nr;

	return 0;



out_err: