Skip to content
/ linux Public

Commit 13458b3

Browse files
acmelSasha Levin
authored andcommitted
perf annotate: Fix BUILD_NONDISTRO=1 missing args->ms conversions to pointer
[ Upstream commit dda5f92 ] Fix a few missing conversions to pointer in the usage of 'struct annotate_args' 'ms' member in symbol__disassemble_bpf_libbfd(). Fixes: 0041989 ("perf annotate: Fix args leak of map_symbol") Reviewed-by: Ian Rogers <irogers@google.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 8943b2c commit 13458b3

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tools/perf/util/libbfd.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ int symbol__disassemble_bpf_libbfd(struct symbol *sym __maybe_unused,
494494
struct bpf_prog_info_node *info_node;
495495
int len = sym->end - sym->start;
496496
disassembler_ftype disassemble;
497-
struct map *map = args->ms.map;
497+
struct map *map = args->ms->map;
498498
struct perf_bpil *info_linear;
499499
struct disassemble_info info;
500500
struct dso *dso = map__dso(map);
@@ -605,7 +605,7 @@ int symbol__disassemble_bpf_libbfd(struct symbol *sym __maybe_unused,
605605
args->line = strdup(srcline);
606606
args->line_nr = 0;
607607
args->fileloc = NULL;
608-
args->ms.sym = sym;
608+
args->ms->sym = sym;
609609
dl = disasm_line__new(args);
610610
if (dl) {
611611
annotation_line__add(&dl->al,
@@ -617,7 +617,7 @@ int symbol__disassemble_bpf_libbfd(struct symbol *sym __maybe_unused,
617617
args->line = buf + prev_buf_size;
618618
args->line_nr = 0;
619619
args->fileloc = NULL;
620-
args->ms.sym = sym;
620+
args->ms->sym = sym;
621621
dl = disasm_line__new(args);
622622
if (dl)
623623
annotation_line__add(&dl->al, &notes->src->source);

0 commit comments

Comments
 (0)