Skip to contentSkip to conversation

perf annotate: Fix BUILD_NONDISTRO=1 missing args->ms conversions to pointer

PATCH In review Arnaldo Carvalho de Melo 2 participants 2 messages Jan 26 perf events

lore
Share & tools
lore

Arnaldo Carvalho de Melo

author maintainer
#0 lore raw

PATCH 1/1 perf annotate: Fix BUILD_NONDISTRO=1 missing args->ms conversions to pointer

Fix a few missing conversions to pointer in the usage of 'struct annotate_args' 'ms' member in symbol__disassemble_bpf_libbfd().

Fixes 00419892bac28bf1 ("perf annotate: Fix args leak of map_symbol")
---
 tools/perf/util/libbfd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/libbfd.c +3 -3
index 79f4528234a9d6d5..63ea3fb53e77d5fb 100644
@@ -501,7 +501,7 @@ int symbol__disassemble_bpf_libbfd(struct symbol *sym __maybe_unused,
 	struct bpf_prog_info_node *info_node;
 	int len = sym->end - sym->start;
 	disassembler_ftype disassemble;
-	struct map *map = args->ms.map;
+	struct map *map = args->ms->map;
 	struct perf_bpil *info_linear;
 	struct disassemble_info info;
 	struct dso *dso = map__dso(map);
@@ -612,7 +612,7 @@ int symbol__disassemble_bpf_libbfd(struct symbol *sym __maybe_unused,
 			args->line = strdup(srcline);
 			args->line_nr = 0;
 			args->fileloc = NULL;
-			args->ms.sym  = sym;
+			args->ms->sym = sym;
 			dl = disasm_line__new(args);
 			if (dl) {
 				annotation_line__add(&dl->al,
@@ -624,7 +624,7 @@ int symbol__disassemble_bpf_libbfd(struct symbol *sym __maybe_unused,
 		args->line = buf + prev_buf_size;
 		args->line_nr = 0;
 		args->fileloc = NULL;
-		args->ms.sym  = sym;
+		args->ms->sym = sym;
 		dl = disasm_line__new(args);
 		if (dl)
 			annotation_line__add(&dl->al, &notes->src->source);
Signature · 1 line
2.52.0
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Arnaldo Carvalho de Melo

Fix a few missing conversions to pointer in the usage of 'struct annotate_args' 'ms' member in symbol__disassemble_bpf_libbfd().

Fixes 00419892bac28bf1 ("perf annotate: Fix args leak of map_symbol")

Thanks!
Ian

Quoted 38 lines
---
 tools/perf/util/libbfd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/libbfd.c +3 -4
index 79f4528234a9d6d5..63ea3fb53e77d5fb 100644
@@ -501,7 +501,7 @@ int symbol__disassemble_bpf_libbfd(struct symbol *sym __maybe_unused,
        struct bpf_prog_info_node *info_node;
        int len = sym->end - sym->start;
        disassembler_ftype disassemble;
-       struct map *map = args->ms.map;
+       struct map *map = args->ms->map;
        struct perf_bpil *info_linear;
        struct disassemble_info info;
        struct dso *dso = map__dso(map);
@@ -612,7 +612,7 @@ int symbol__disassemble_bpf_libbfd(struct symbol *sym __maybe_unused,
                        args->line = strdup(srcline);
                        args->line_nr = 0;
                        args->fileloc = NULL;
-                       args->ms.sym  = sym;
+                       args->ms->sym = sym;
                        dl = disasm_line__new(args);
                        if (dl) {
                                annotation_line__add(&dl->al,
@@ -624,7 +624,7 @@ int symbol__disassemble_bpf_libbfd(struct symbol *sym __maybe_unused,
                args->line = buf + prev_buf_size;
                args->line_nr = 0;
                args->fileloc = NULL;
-               args->ms.sym  = sym;
+               args->ms->sym = sym;
                dl = disasm_line__new(args);
                if (dl)
                        annotation_line__add(&dl->al, &notes->src->source);
--

2.52.0