Skip to content

Commit 331c7cb

Browse files
Ravi Bangoriaacmel
authored andcommitted
perf symbols: Fix memory corruption because of zero length symbols
Perf top is often crashing at very random locations on powerpc. After investigating, I found the crash only happens when sample is of zero length symbol. Powerpc kernel has many such symbols which does not contain length details in vmlinux binary and thus start and end addresses of such symbols are same. Structure struct sym_hist { u64 nr_samples; u64 period; struct sym_hist_entry addr[0]; }; has last member 'addr[]' of size zero. 'addr[]' is an array of addresses that belongs to one symbol (function). If function consist of 100 instructions, 'addr' points to an array of 100 'struct sym_hist_entry' elements. For zero length symbol, it points to the *empty* array, i.e. no members in the array and thus offset 0 is also invalid for such array. static int __symbol__inc_addr_samples(...) { ... offset = addr - sym->start; h = annotation__histogram(notes, evidx); h->nr_samples++; h->addr[offset].nr_samples++; h->period += sample->period; h->addr[offset].period += sample->period; ... } Here, when 'addr' is same as 'sym->start', 'offset' becomes 0, which is valid for normal symbols but *invalid* for zero length symbols and thus updating h->addr[offset] causes memory corruption. Fix this by adding one dummy element for zero length symbols. Link: https://lkml.org/lkml/2016/10/10/148 Fixes: edee44b ("perf annotate: Don't throw error for zero length symbols") Signed-off-by: Ravi Bangoria <[email protected]> Acked-by: Jiri Olsa <[email protected]> Acked-by: Namhyung Kim <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Jin Yao <[email protected]> Cc: Kim Phillips <[email protected]> Cc: Naveen N. Rao <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Taeung Song <[email protected]> Link: http://lkml.kernel.org/r/1508854806-10542-1-git-send-email-ravi.bangoria@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 2eece39 commit 331c7cb

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

tools/perf/util/annotate.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,9 +606,19 @@ static struct arch *arch__find(const char *name)
606606
int symbol__alloc_hist(struct symbol *sym)
607607
{
608608
struct annotation *notes = symbol__annotation(sym);
609-
const size_t size = symbol__size(sym);
609+
size_t size = symbol__size(sym);
610610
size_t sizeof_sym_hist;
611611

612+
/*
613+
* Add buffer of one element for zero length symbol.
614+
* When sample is taken from first instruction of
615+
* zero length symbol, perf still resolves it and
616+
* shows symbol name in perf report and allows to
617+
* annotate it.
618+
*/
619+
if (size == 0)
620+
size = 1;
621+
612622
/* Check for overflow when calculating sizeof_sym_hist */
613623
if (size > (SIZE_MAX - sizeof(struct sym_hist)) / sizeof(struct sym_hist_entry))
614624
return -1;

0 commit comments

Comments
 (0)