public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Jiri Olsa <jolsa@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
	David Ahern <dsahern@gmail.com>,
	Frederic Weisbecker <fweisbec@gmail.com>
Subject: [PATCH 1/7] perf callchain: Check return value of add_child()
Date: Fri, 22 Jan 2016 22:41:34 +0900	[thread overview]
Message-ID: <1453470100-8637-2-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1453470100-8637-1-git-send-email-namhyung@kernel.org>

The create_child() in add_child() can return NULL in case of memory
allocation failure.  So check the return value and bail out.  The proper
error handling will be added later.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/util/callchain.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 53c43eb9489e..134d88b33fc1 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -453,6 +453,9 @@ add_child(struct callchain_node *parent,
 	struct callchain_node *new;
 
 	new = create_child(parent, false);
+	if (new == NULL)
+		return NULL;
+
 	fill_node(new, cursor);
 
 	new->children_hit = 0;
@@ -524,6 +527,8 @@ split_add_child(struct callchain_node *parent,
 
 		node = callchain_cursor_current(cursor);
 		new = add_child(parent, cursor, period);
+		if (new == NULL)
+			return;
 
 		/*
 		 * This is second child since we moved parent's children
@@ -585,6 +590,9 @@ append_chain_children(struct callchain_node *root,
 	}
 	/* nothing in children, add to the current node */
 	rnode = add_child(root, cursor, period);
+	if (rnode == NULL)
+		return;
+
 	rb_link_node(&rnode->rb_node_in, parent, p);
 	rb_insert_color(&rnode->rb_node_in, &root->rb_root_in);
 
-- 
2.6.4

  reply	other threads:[~2016-01-22 13:43 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-22 13:41 [PATCHSET 0/7] perf tools: Check error during collapsing hist entries Namhyung Kim
2016-01-22 13:41 ` Namhyung Kim [this message]
2016-01-22 13:41 ` [PATCH 2/7] perf callchain: Check return value of fill_node() Namhyung Kim
2016-01-22 13:41 ` [PATCH 3/7] perf callchain: Add enum match_result for match_chain() Namhyung Kim
2016-01-23 17:01   ` Jiri Olsa
2016-01-24  4:05     ` Namhyung Kim
2016-01-24  5:49     ` [PATCH v2 " Namhyung Kim
2016-01-22 13:41 ` [PATCH 4/7] perf callchain: Check return value of split_add_child() Namhyung Kim
2016-01-22 13:41 ` [PATCH 5/7] perf callchain: Check return value of append_chain_children() Namhyung Kim
2016-01-22 13:41 ` [PATCH 6/7] perf hists: Return error from hists__collapse_resort() Namhyung Kim
2016-01-22 13:41 ` [PATCH 7/7] perf report: Check error during report__collapse_hists() Namhyung Kim
2016-01-23 17:01 ` [PATCHSET 0/7] perf tools: Check error during collapsing hist entries Jiri Olsa
2016-01-24  4:37   ` Namhyung Kim
2016-01-25  7:12     ` 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=1453470100-8637-2-git-send-email-namhyung@kernel.org \
    --to=namhyung@kernel.org \
    --cc=acme@kernel.org \
    --cc=dsahern@gmail.com \
    --cc=fweisbec@gmail.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.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