Skip to content

Commit

Permalink
perf tools: Fix resources leak in perf_data__open_dir()
Browse files Browse the repository at this point in the history
[ Upstream commit 0a6564e ]

In perf_data__open_dir(), opendir() opens the directory stream.  Add
missing closedir() to release it after use.

Fixes: eb61767 ("perf data: Add perf_data__open_dir_data function")
Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20221229090903.1402395-1-linmq006@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Yuuoniy authored and gregkh committed Jan 12, 2023
1 parent 466655d commit 2bb8016
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions tools/perf/util/data.c
Expand Up @@ -132,6 +132,7 @@ int perf_data__open_dir(struct perf_data *data)
file->size = st.st_size;
}

closedir(dir);
if (!files)
return -EINVAL;

Expand All @@ -140,6 +141,7 @@ int perf_data__open_dir(struct perf_data *data)
return 0;

out_err:
closedir(dir);
close_dir(files, nr);
return ret;
}
Expand Down

0 comments on commit 2bb8016

Please sign in to comment.