Commit-ID: 81f981d7ec43ed93901c12b6521d39b06f1ed3d3 Gitweb: https://git.kernel.org/tip/81f981d7ec43ed93901c12b6521d39b06f1ed3d3 Author: Jiri Olsa <jo...@kernel.org> AuthorDate: Thu, 15 Feb 2018 13:26:29 +0100 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitDate: Fri, 16 Feb 2018 14:25:56 -0300
perf machine: Free root_dir in machine__init() error path Free root_dir in machine__init() error path. Signed-off-by: Jiri Olsa <jo...@kernel.org> Cc: Alexander Shishkin <alexander.shish...@linux.intel.com> Cc: David Ahern <dsah...@gmail.com> Cc: Namhyung Kim <namhy...@kernel.org> Cc: Peter Zijlstra <pet...@infradead.org> Link: http://lkml.kernel.org/r/20180215122635.24029-4-jo...@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/util/machine.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index b05a674..c976384 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -50,6 +50,8 @@ static void machine__threads_init(struct machine *machine) int machine__init(struct machine *machine, const char *root_dir, pid_t pid) { + int err = -ENOMEM; + memset(machine, 0, sizeof(*machine)); map_groups__init(&machine->kmaps, machine); RB_CLEAR_NODE(&machine->rb_node); @@ -79,7 +81,7 @@ int machine__init(struct machine *machine, const char *root_dir, pid_t pid) char comm[64]; if (thread == NULL) - return -ENOMEM; + goto out; snprintf(comm, sizeof(comm), "[guest/%d]", pid); thread__set_comm(thread, comm, 0); @@ -87,7 +89,11 @@ int machine__init(struct machine *machine, const char *root_dir, pid_t pid) } machine->current_tid = NULL; + err = 0; +out: + if (err) + zfree(&machine->root_dir); return 0; }
