Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8f691f2 authored by Adrian Hunter's avatar Adrian Hunter Committed by Greg Kroah-Hartman
Browse files

perf tools: Fix split_kallsyms_for_kcore() for trampoline symbols 



commit d6d457451eb94fa747dc202765592eb8885a7352 upstream.

Kallsyms symbols do not have a size, so the size becomes the distance to
the next symbol.

Consequently the recently added trampoline symbols end up with large
sizes because the trampolines are some distance from one another and the
main kernel map.

However, symbols that end outside their map can disrupt the symbol tree
because, after mapping, it can appear incorrectly that they overlap
other symbols.

Add logic to truncate symbol size to the end of the corresponding map.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: stable@vger.kernel.org
Fixes: d83212d5 ("kallsyms, x86: Export addresses of PTI entry trampolines")
Link: http://lkml.kernel.org/r/20190109091835.5570-2-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e25353a0

tools/perf/util/symbol.c

+2 −0
Original line number Diff line number Diff line
@@ -709,6 +709,8 @@ static int map_groups__split_kallsyms_for_kcore(struct map_groups *kmaps, struct 
		}



		pos->start -= curr_map->start - curr_map->pgoff;

		if (pos->end > curr_map->end)

			pos->end = curr_map->end;

		if (pos->end)

			pos->end -= curr_map->start - curr_map->pgoff;

		symbols__insert(&curr_map->dso->symbols, pos);