perf annotate: Fix 's' on source line when disasm is empty
authorRiccardo Mancini <rickyman7@gmail.com>
Mon, 5 Jul 2021 16:15:25 +0000 (18:15 +0200)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 7 Jul 2021 13:28:10 +0000 (10:28 -0300)
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: 6de249d66d2e7881 ("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>
tools/perf/ui/browsers/annotate.c

index f5509a9..5812a22 100644 (file)
@@ -350,14 +350,14 @@ static struct annotation_line *annotate_browser__find_next_asm_line(
        struct annotation_line *it = al;
 
        /* find next asm line */
-       list_for_each_entry_continue(it, browser->b.top, node) {
+       list_for_each_entry_continue(it, browser->b.entries, node) {
                if (it->idx_asm >= 0)
                        return it;
        }
 
        /* no asm line found forwards, try backwards */
        it = al;
-       list_for_each_entry_continue_reverse(it, browser->b.top, node) {
+       list_for_each_entry_continue_reverse(it, browser->b.entries, node) {
                if (it->idx_asm >= 0)
                        return it;
        }