All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Ahern <dsahern@gmail.com>
To: acme@ghostprotocols.net, linux-kernel@vger.kernel.org
Cc: mingo@kernel.org, peterz@infradead.org, fweisbec@gmail.com,
	David Ahern <dsahern@gmail.com>,
	Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>,
	Dong Hao <haodong@linux.vnet.ibm.com>
Subject: [PATCH 07/12] perf kvm: handle realloc failures
Date: Mon,  8 Oct 2012 11:17:31 -0600	[thread overview]
Message-ID: <1349716656-48165-8-git-send-email-dsahern@gmail.com> (raw)
In-Reply-To: <1349716656-48165-1-git-send-email-dsahern@gmail.com>

Save previous pointer and free on failure.

Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: Dong Hao <haodong@linux.vnet.ibm.com>
---
 tools/perf/builtin-kvm.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index a23db89..af74a97 100644
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -327,6 +327,7 @@ static int kvm_events_hash_fn(u64 key)
 static bool kvm_event_expand(struct kvm_event *event, int vcpu_id)
 {
 	int old_max_vcpu = event->max_vcpu;
+	void *prev;
 
 	if (vcpu_id < event->max_vcpu)
 		return true;
@@ -334,9 +335,11 @@ static bool kvm_event_expand(struct kvm_event *event, int vcpu_id)
 	while (event->max_vcpu <= vcpu_id)
 		event->max_vcpu += DEFAULT_VCPU_NUM;
 
+	prev = event->vcpu;
 	event->vcpu = realloc(event->vcpu,
 			      event->max_vcpu * sizeof(*event->vcpu));
 	if (!event->vcpu) {
+		free(prev);
 		pr_err("Not enough memory\n");
 		return false;
 	}
-- 
1.7.10.1


  parent reply	other threads:[~2012-10-08 17:18 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-08 17:17 [PATCH 00/12] perf kvm: Add live mode for analyzing events David Ahern
2012-10-08 17:17 ` [PATCH 01/12] perf evlist: restore some methods removed in an earlier cleanup David Ahern
2012-10-08 17:17 ` [PATCH 02/12] perf evlist: move tracepoint processing code to evlist.c David Ahern
2012-10-08 17:17 ` [PATCH 03/12] perf evlist: add initialzation function for tracepoints David Ahern
2012-10-08 17:17 ` [PATCH 04/12] perf session: export a few functions for event processing David Ahern
2012-10-08 17:17 ` [PATCH 05/12] perf top: move CONSOLE_CLEAR to header file David Ahern
2012-10-08 17:17 ` [PATCH 06/12] perf kvm: remove typecast in init_kvm_event_record David Ahern
2012-10-09 17:38   ` [tip:perf/core] perf kvm: Remove " tip-bot for David Ahern
2012-10-08 17:17 ` David Ahern [this message]
2012-10-08 20:19   ` [PATCH 07/12] perf kvm: handle realloc failures Arnaldo Carvalho de Melo
2012-10-08 20:34     ` David Ahern
2012-10-08 21:38       ` Arnaldo Carvalho de Melo
2012-10-08 17:17 ` [PATCH 08/12] perf kvm: add braces around multi-line statements David Ahern
2012-10-09 17:40   ` [tip:perf/core] perf kvm: Add " tip-bot for David Ahern
2012-10-08 17:17 ` [PATCH 09/12] perf kvm: split out tracepoints from record args David Ahern
2012-10-17  8:19   ` Xiao Guangrong
2012-10-17 13:38     ` David Ahern
2012-10-08 17:17 ` [PATCH 10/12] perf kvm: total count is a u64, print as so David Ahern
2012-10-09 17:39   ` [tip:perf/core] perf kvm: Total " tip-bot for David Ahern
2012-10-08 17:17 ` [PATCH 11/12] perf kvm: only process events for vcpus of interest David Ahern
2012-10-09 17:37   ` [tip:perf/core] perf kvm: Only " tip-bot for David Ahern
2012-10-08 17:17 ` [PATCH 12/12] perf kvm: add live mode David Ahern
2012-10-08 20:35   ` Arnaldo Carvalho de Melo
2012-10-08 20:54     ` David Ahern
2012-10-08 21:44       ` Arnaldo Carvalho de Melo
2012-10-08 21:57         ` David Ahern

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=1349716656-48165-8-git-send-email-dsahern@gmail.com \
    --to=dsahern@gmail.com \
    --cc=acme@ghostprotocols.net \
    --cc=fweisbec@gmail.com \
    --cc=haodong@linux.vnet.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=xiaoguangrong@linux.vnet.ibm.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.