perf machine: Fill map_symbol->maps in append_inlines() to fix segfault
I forgot to fill in the map_symbol->maps field in append_inlines() which then makes code down the line segfault when trying to deref it. It doesn't make any sense to have an addr_location with its 'map' member not NULL while its 'maps' is NULL, after all al->maps is where al->map is in. It is done that way so that we don't have to have in each 'struct map' a pointer to the 'struct maps' it is in, as we had in the past when we would have 'map->mg', before 'struct maps' was combined with 'struct map_groups', because there was always a one-to-one relationship for these structs. This fixes a segfault when processing DWARF callgraphs in 'perf report'. Reported-by: Jiri Olsa <jolsa@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Namhyung Kim <namhyung@kernel.org> Fixes: 08f6680e627e ("perf tools: Add a 'struct map_groups' pointer to 'struct map_symbol'") Link: http://lore.kernel.org/lkml/20191129160631.GD26963@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
fa7f7e7354
commit
77b91c1a52
@ -2446,6 +2446,7 @@ static int append_inlines(struct callchain_cursor *cursor, struct map_symbol *ms
|
|||||||
|
|
||||||
list_for_each_entry(ilist, &inline_node->val, list) {
|
list_for_each_entry(ilist, &inline_node->val, list) {
|
||||||
struct map_symbol ilist_ms = {
|
struct map_symbol ilist_ms = {
|
||||||
|
.maps = ms->maps,
|
||||||
.map = map,
|
.map = map,
|
||||||
.sym = ilist->symbol,
|
.sym = ilist->symbol,
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user