Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1338557
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 17/22] perf callchain: Check return value of fill_node() |
| Date | 2016-02-19 23:50 +0100 |
| Message-ID | <r4226-3Wq-29@gated-at.bofh.it> (permalink) |
| References | <r4226-3Wq-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Namhyung Kim <namhyung@kernel.org>
Memory allocation in the fill_node() can fail so change its return type
to int and check it in add_child() too.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1455631723-17345-4-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/callchain.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 134d88b33fc1..a82ea6f6fc0f 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -416,7 +416,7 @@ create_child(struct callchain_node *parent, bool inherit_children)
/*
* Fill the node with callchain values
*/
-static void
+static int
fill_node(struct callchain_node *node, struct callchain_cursor *cursor)
{
struct callchain_cursor_node *cursor_node;
@@ -433,7 +433,7 @@ fill_node(struct callchain_node *node, struct callchain_cursor *cursor)
call = zalloc(sizeof(*call));
if (!call) {
perror("not enough memory for the code path tree");
- return;
+ return -1;
}
call->ip = cursor_node->ip;
call->ms.sym = cursor_node->sym;
@@ -443,6 +443,7 @@ fill_node(struct callchain_node *node, struct callchain_cursor *cursor)
callchain_cursor_advance(cursor);
cursor_node = callchain_cursor_current(cursor);
}
+ return 0;
}
static struct callchain_node *
@@ -456,7 +457,16 @@ add_child(struct callchain_node *parent,
if (new == NULL)
return NULL;
- fill_node(new, cursor);
+ if (fill_node(new, cursor) < 0) {
+ struct callchain_list *call, *tmp;
+
+ list_for_each_entry_safe(call, tmp, &new->val, list) {
+ list_del(&call->list);
+ free(call);
+ }
+ free(new);
+ return NULL;
+ }
new->children_hit = 0;
new->hit = period;
--
2.5.0
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[GIT PULL 00/22] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 09/22] perf tools: Create config_term_names array Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 11/22] perf tools: Rename and move pmu_event_name to get_config_name Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 18/22] perf callchain: Add enum match_result for match_chain() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 03/22] perf evlist: Handle -EINVAL for sample_freq > max_sample_rate in strerror_open() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 16/22] perf callchain: Check return value of add_child() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 05/22] perf test: Reduce the sample_freq for the 'object code reading' test Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 13/22] perf tools: Enable config raw and numeric events Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 17/22] perf callchain: Check return value of fill_node() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 12/22] perf tools: Introduce opt_event_config nonterminal Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 01/22] perf evlist: Reference count the cpu and thread maps at set_maps() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 04/22] perf tests: Use perf_evlist__strerror_open() to provide hints about max_freq Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 21/22] perf hists: Return error from hists__collapse_resort() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 19/22] perf callchain: Check return value of split_add_child() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 06/22] perf stat: Handled scaled == -1 case for counters Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 02/22] perf record: Add --all-user/--all-kernel options Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 22/22] perf report: Check error during report__collapse_hists() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 08/22] perf tools: Fix checking asprintf return value Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 07/22] perf bpf: Rename bpf_prog_priv__clear() to clear_prog_priv() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 20/22] perf callchain: Check return value of append_chain_children() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 15/22] perf hists browser: Fix percentage update on key press Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 [PATCH 14/22] perf tools: Enable config and setting names for legacy cache events Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:50 +0100 Re: [GIT PULL 00/22] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2016-02-20 12:00 +0100
csiph-web