Commit 6080728f authored Oct 15, 2019 by Yunfeng Ye Committed by Arnaldo Carvalho de Melo Oct 15, 2019

perf tools: Fix resource leak of closedir() on the error paths



Both build_mem_topology() and rm_rf_depth_pat() have resource leaks of
closedir() on the error paths.

Fix this by calling closedir() before function returns.

Fixes: e2091ced ("perf tools: Add MEM_TOPOLOGY feature to perf data file")
Fixes: cdb6b023 ("perf tools: Add pattern name checking to rm_rf")
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Feilong Lin <linfeilong@huawei.com>
Cc: Hu Shiyuan <hushiyuan@huawei.com>
Cc: Igor Lubashev <ilubashe@akamai.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Martin KaFai Lau <kafai@fb.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <songliubraving@fb.com>
Cc: Yonghong Song <yhs@fb.com>
Link: http://lore.kernel.org/lkml/cd5f7cd2-b80d-6add-20a1-32f4f43e0744@huawei.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 98a8b2e6

tools/perf/util/header.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1296,8 +1296,10 @@ static int build_mem_topology(struct memory_node nodes, u64 size, u64 cntp)
		continue;

		if (WARN_ONCE(cnt >= size,
		"failed to write MEM_TOPOLOGY, way too many nodes\n"))
		"failed to write MEM_TOPOLOGY, way too many nodes\n")) {
		closedir(dir);
		return -1;
		}

		ret = memory_node__read(&nodes[cnt++], idx);
		}

tools/perf/util/util.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -154,8 +154,10 @@ static int rm_rf_depth_pat(const char path, int depth, const char *pat)
		if (!strcmp(d->d_name, ".") \|\| !strcmp(d->d_name, ".."))
		continue;

		if (!match_pat(d->d_name, pat))
		return -2;
		if (!match_pat(d->d_name, pat)) {
		ret = -2;
		break;
		}

		scnprintf(namebuf, sizeof(namebuf), "%s/%s",
		path, d->d_name);

Admin message