Commit 52cff612 authored Jul 16, 2021 by Riccardo Mancini Committed by Greg Kroah-Hartman Jul 28, 2021

perf data: Close all files in close_dir()



[ Upstream commit d4b3eedce151e63932ce4a00f1d0baa340a8b907 ]

When using 'perf report' in directory mode, the first file is not closed
on exit, causing a memory leak.

The problem is caused by the iterating variable never reaching 0.

Fixes: 14552063 ("perf data: Add perf_data__(create_dir|close_dir) functions")
Signed-off-by: Riccardo Mancini <rickyman7@gmail.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Zhen Lei <thunder.leizhen@huawei.com>
Link: http://lore.kernel.org/lkml/20210716141122.858082-1-rickyman7@gmail.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 0f63857d

tools/perf/util/data.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@

		static void close_dir(struct perf_data_file *files, int nr)
		{
		while (--nr >= 1) {
		while (--nr >= 0) {
		close(files[nr].fd);
		zfree(&files[nr].path);
		}