From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
David Ahern <dsahern@gmail.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 02/10] perf tools: Free root_dir in machine__init error path
Date: Wed, 7 Feb 2018 15:48:30 +0100 [thread overview]
Message-ID: <20180207144838.16823-3-jolsa@kernel.org> (raw)
In-Reply-To: <20180207144838.16823-1-jolsa@kernel.org>
Freeing root_dir in machine__init error path.
Link: http://lkml.kernel.org/n/tip-ng92slsanexqw7h1d6sadnj7@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
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 b05a67464c03..c976384f9022 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;
}
--
2.13.6
next prev parent reply other threads:[~2018-02-07 14:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-07 14:48 [PATCHv2 00/10] perf tool: Assorted fixes Jiri Olsa
2018-02-07 14:48 ` [PATCH 01/10] tools lib symbol: Skip non-address kallsyms line Jiri Olsa
2018-02-07 14:48 ` Jiri Olsa [this message]
2018-02-07 14:48 ` [PATCH 03/10] perf tools: Move kernel mmap name into struct machine Jiri Olsa
2018-02-07 14:48 ` [PATCH 04/10] perf tools: Don't search for active kernel start in __machine__create_kernel_maps Jiri Olsa
2018-02-07 14:48 ` [PATCH 05/10] perf tools: Generalize machine__set_kernel_mmap function Jiri Olsa
2018-02-07 14:48 ` [PATCH 06/10] perf tools: Use machine__set_kernel_mmap instead of map_groups__fixup_end Jiri Olsa
2018-02-08 0:34 ` Namhyung Kim
2018-02-08 8:56 ` Jiri Olsa
2018-02-07 14:48 ` [PATCH 07/10] perf tools: Rename __map_groups__fixup_end to map_groups__fixup_end Jiri Olsa
2018-02-07 14:48 ` [PATCH 08/10] perf tools: Remove machine__load_kallsyms function Jiri Olsa
2018-02-07 14:48 ` [PATCH 09/10] perf tools: Do not create kernel maps in sample__resolve Jiri Olsa
2018-02-07 14:48 ` [PATCH 10/10] perf tools: Check if we read regular file in dso__load Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180207144838.16823-3-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=dsahern@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox