perfcounters: Fixes for filename:line displays
PATCH 1/1 perfcounters: Fixes for filename:line displays
- fix addr2line on userspace binary: don't only check kernel image.
- fix string allocation size for path: missing ending null char room
- fix overflow in symbol extra info
Reported-by Ingo Molnar <[email protected]>
Signed-off-by Frederic Weisbecker <[email protected]>
--- tools/perf/builtin-annotate.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
tools/perf/builtin-annotate.c +6 -5
@@ -1116,7 +1116,7 @@ parse_line(FILE *file, struct symbol *sym, __u64 start, __u64 len)if (offset < len) hits = sym->hist[offset]; -if (sym_ext) { +if (offset < len && sym_ext) { path = sym_ext[offset].path; percent = sym_ext[offset].percent; }else if (sym->hist_sum)
@@ -1190,7 +1190,8 @@ static void free_source_line(struct symbol *sym, int len) }/* Get the filename:line for the colored entries */ -static void get_source_line (struct symbol *sym,__u64 start,int len) +static void +get_source_line (struct symbol *sym,__u64 start,int len,char *filename) {int i;char cmd[PATH_MAX *2 ];
@@ -1216,7 +1217,7 @@ static void get_source_line(struct symbol *sym, __u64 start, int len)continue ; offset = start + i; -sprintf (cmd,"addr2line -e %s %016llx" , vmlinux, offset); +sprintf (cmd,"addr2line -e %s %016llx" , filename, offset); fp =popen (cmd,"r" );if (!fp)continue ;
@@ -1224,7 +1225,7 @@ static void get_source_line(struct symbol *sym, __u64 start, int len)if (getline (&path, &line_len, fp) <0 || !line_len) goto next; - sym_ext[i].path =malloc (sizeof (char ) * line_len); + sym_ext[i].path =malloc (sizeof (char ) * line_len +1 );if (!sym_ext[i].path) goto next;
@@ -1285,7 +1286,7 @@ static void annotate_sym(struct dso *dso, struct symbol *sym) len = sym->end - sym->start;if (print_line) { -get_source_line (sym, start, len); +get_source_line (sym, start, len, filename);print_summary (filename); }
Signature · 1 line
1.6.2.3
[tip:perfcounters/core] perf annotate: Fixes for filename:line displays
Commit-ID: c17c2db1f3cea41c3543025905d3582c6937dd95 Gitweb: http://git.kernel.org/tip/c17c2db1f3cea41c3543025905d3582c6937dd95 Author: Frederic Weisbecker <[email protected]> AuthorDate: Sat, 13 Jun 2009 17:39:23 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Sat, 13 Jun 2009 17:51:00 +0200
perf annotate: Fixes for filename:line displays
- fix addr2line on userspace binary: don't only check kernel image.
- fix string allocation size for path: missing ending null char room
- fix overflow in symbol extra info
Reported-by Ingo Molnar <[email protected]>
Signed-off-by Frederic Weisbecker <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Paul Mackerras <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- tools/perf/builtin-annotate.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
tools/perf/builtin-annotate.c +6 -5
@@ -1116,7 +1116,7 @@ parse_line(FILE *file, struct symbol *sym, __u64 start, __u64 len)if (offset < len) hits = sym->hist[offset]; -if (sym_ext) { +if (offset < len && sym_ext) { path = sym_ext[offset].path; percent = sym_ext[offset].percent; }else if (sym->hist_sum)
@@ -1190,7 +1190,8 @@ static void free_source_line(struct symbol *sym, int len) }/* Get the filename:line for the colored entries */ -static void get_source_line (struct symbol *sym,__u64 start,int len) +static void +get_source_line (struct symbol *sym,__u64 start,int len,char *filename) {int i;char cmd[PATH_MAX *2 ];
@@ -1216,7 +1217,7 @@ static void get_source_line(struct symbol *sym, __u64 start, int len)continue ; offset = start + i; -sprintf (cmd,"addr2line -e %s %016llx" , vmlinux, offset); +sprintf (cmd,"addr2line -e %s %016llx" , filename, offset); fp =popen (cmd,"r" );if (!fp)continue ;
@@ -1224,7 +1225,7 @@ static void get_source_line(struct symbol *sym, __u64 start, int len)if (getline (&path, &line_len, fp) <0 || !line_len) goto next; - sym_ext[i].path =malloc (sizeof (char ) * line_len); + sym_ext[i].path =malloc (sizeof (char ) * line_len +1 );if (!sym_ext[i].path) goto next;
@@ -1285,7 +1286,7 @@ static void annotate_sym(struct dso *dso, struct symbol *sym) len = sym->end - sym->start;if (print_line) { -get_source_line (sym, start, len); +get_source_line (sym, start, len, filename);print_summary (filename); }