linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung@kernel.org>,
	Don Zickus <dzickus@redhat.com>, Jiri Olsa <jolsa@redhat.com>,
	Joe Mario <jmario@redhat.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 07/13] perf tools: Fix memory leak when synthesizing thread records
Date: Tue, 18 Mar 2014 18:25:59 -0300	[thread overview]
Message-ID: <1395177965-8879-8-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1395177965-8879-1-git-send-email-acme@infradead.org>

From: Namhyung Kim <namhyung@kernel.org>

Checking default guest machine should be done before allocating event
structures otherwise it'll leak memory.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Joe Mario <jmario@redhat.com>
Link: http://lkml.kernel.org/r/87ob15tx6a.fsf@sejong.aot.lge.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/event.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index ebb48a623407..9d12aa6dd485 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -446,6 +446,9 @@ int perf_event__synthesize_threads(struct perf_tool *tool,
 	union perf_event *comm_event, *mmap_event, *fork_event;
 	int err = -1;
 
+	if (machine__is_default_guest(machine))
+		return 0;
+
 	comm_event = malloc(sizeof(comm_event->comm) + machine->id_hdr_size);
 	if (comm_event == NULL)
 		goto out;
@@ -458,9 +461,6 @@ int perf_event__synthesize_threads(struct perf_tool *tool,
 	if (fork_event == NULL)
 		goto out_free_mmap;
 
-	if (machine__is_default_guest(machine))
-		return 0;
-
 	snprintf(proc_path, sizeof(proc_path), "%s/proc", machine->root_dir);
 	proc = opendir(proc_path);
 
-- 
1.8.1.4


  parent reply	other threads:[~2014-03-18 21:34 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-18 21:25 [GIT PULL 00/13] perf/core improvements and fixes Arnaldo Carvalho de Melo
2014-03-18 21:25 ` [PATCH 01/13] perf timechart: Fix off-by-one error in 'record' argv handling Arnaldo Carvalho de Melo
2014-03-18 21:25 ` [PATCH 02/13] perf sched: Fixup header alignment in 'latency' output Arnaldo Carvalho de Melo
2014-03-18 21:25 ` [PATCH 03/13] perf symbols: Record the reason for filtering an address_location Arnaldo Carvalho de Melo
2014-03-18 21:25 ` [PATCH 04/13] perf symbols: Apply all filters to an addr_location Arnaldo Carvalho de Melo
2014-03-18 21:25 ` [PATCH 05/13] perf report: Merge al->filtered with hist_entry->filtered Arnaldo Carvalho de Melo
2014-03-18 21:25 ` [PATCH 06/13] perf tools: Use tid in mmap/mmap2 events to find maps Arnaldo Carvalho de Melo
2014-03-19  7:13   ` Adrian Hunter
2014-03-19 10:19     ` Jiri Olsa
     [not found]     ` <20140319131945.GW25953@redhat.com>
2014-03-19 13:30       ` Jiri Olsa
2014-03-19 14:27         ` Adrian Hunter
2014-03-19 14:43           ` Don Zickus
2014-03-19 15:17             ` Adrian Hunter
2014-03-20 14:44         ` Arnaldo Carvalho de Melo
2014-03-18 21:25 ` Arnaldo Carvalho de Melo [this message]
2014-03-18 21:26 ` [PATCH 08/13] perf report: Use ui__has_annotation() Arnaldo Carvalho de Melo
2014-03-18 21:26 ` [PATCH 09/13] perf annotate: Print the evsel name in the stdio output Arnaldo Carvalho de Melo
2014-03-18 21:26 ` [PATCH 10/13] perf tools: Remove thread__find_map function Arnaldo Carvalho de Melo
2014-03-18 21:26 ` [PATCH 11/13] perf evsel: Update function names in debug messages Arnaldo Carvalho de Melo
2014-03-18 21:26 ` [PATCH 12/13] perf tools: Update some code references in design.txt Arnaldo Carvalho de Melo
2014-03-18 21:26 ` [PATCH 13/13] perf tools: Remove unused simple_strtoul() function Arnaldo Carvalho de Melo
2014-03-19  7:07 ` [GIT PULL 00/13] perf/core improvements and fixes Ingo Molnar

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=1395177965-8879-8-git-send-email-acme@infradead.org \
    --to=acme@infradead.org \
    --cc=acme@redhat.com \
    --cc=dzickus@redhat.com \
    --cc=jmario@redhat.com \
    --cc=jolsa@redhat.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;
as well as URLs for NNTP newsgroup(s).