Skip to contentSkip to conversation

perf annotate: fix 's' on source line when disasm is empty

PATCH Applied Riccardo Mancini 2 participants 2 messages Jul 5, 2021 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 6de249d66d2e
---
 tools/perf/ui/browsers/annotate.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/ui/browsers/annotate.c +2 -2
index f5509a958e38..5812a2214cc1 100644
@@ -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;
 	}
Signature · 1 line
2.23.0
maintainer Applied
#1 lore raw

Em Mon, Jul 05, 2021 at 06:15:25PM +0200, Riccardo Mancini escreveu:

Quoted 11 lines

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 6de249d66d2e

Next time please make the fixes be of this form:

Fixes 6de249d66d2e7881 ("perf annotate: Allow 's' on source code lines")

⬢[acme@toolbox perf]$ git config core.abbrev 16
⬢[acme@toolbox perf]$ git config core.abbrev
16
⬢[acme@toolbox perf]$ head -2 ~/.gitconfig
[core]

	abbrev = 16

⬢[acme@toolbox perf]$

Thanks, applied.

- Arnaldo

Quoted 29 lines
---
 tools/perf/ui/browsers/annotate.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/ui/browsers/annotate.c +2 -2
index f5509a958e38..5812a2214cc1 100644
@@ -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;
 	}
Signature · 1 line
2.23.0
Signature · 1 line
- Arnaldo