Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1338554
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 16/22] perf callchain: Check return value of add_child() |
| Date | 2016-02-19 23:50 +0100 |
| Message-ID | <r4226-3Wq-17@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> 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. 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-3-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- 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.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