Skip to content

Commit 5a4451e

Browse files
Manciukicacmel
authored andcommitted
perf annotate: Fix 's' on source line when disasm is empty
If the disasm is empty, 's' should fail. Instead it seemingly works, hiding the empty lines and causing an assertion error on the next time annotate is called (from within perf report). The problem is caused by a buffer overflow, caused by a wrong exit condition in annotate_browser__find_next_asm_line, which checks browser->b.top instead of browser->b.entries. This patch fixes the issue, making annotate_browser__toggle_source fail if the disasm is empty (nothing happens to the user). Fixes: 6de249d ("perf annotate: Allow 's' on source code lines") Signed-off-by: Riccardo Mancini <rickyman7@gmail.com> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Martin Liška <mliska@suse.cz> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lore.kernel.org/lkml/20210705161524.72953-1-rickyman7@gmail.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent d5882a9 commit 5a4451e

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

tools/perf/ui/browsers/annotate.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,14 +350,14 @@ static struct annotation_line *annotate_browser__find_next_asm_line(
350350
struct annotation_line *it = al;
351351

352352
/* find next asm line */
353-
list_for_each_entry_continue(it, browser->b.top, node) {
353+
list_for_each_entry_continue(it, browser->b.entries, node) {
354354
if (it->idx_asm >= 0)
355355
return it;
356356
}
357357

358358
/* no asm line found forwards, try backwards */
359359
it = al;
360-
list_for_each_entry_continue_reverse(it, browser->b.top, node) {
360+
list_for_each_entry_continue_reverse(it, browser->b.entries, node) {
361361
if (it->idx_asm >= 0)
362362
return it;
363363
}

0 commit comments

Comments
 (0)