perf symbol: Avoid use after free
Ian Rogers
reviewerPATCH 1/1 perf symbol: Avoid use after free
If demangling succeeds then sym_name is set to the demangled string that is freed. Rather than test if sym_name is empty and possibly use-after-free on the return path, expand out the alternatives.
--- tools/perf/util/symbol-elf.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
tools/perf/util/symbol-elf.c +10 -8
@@ -577,15 +577,17 @@ static bool get_plt_got_name(GElf_Shdr *shdr, size_t i,/* Get the associated symbol */ gelf_getsym (di->dynsym_data, vr->sym_idx, &sym); sym_name =elf_sym__name (&sym, di->dynstr_data); - demangled =demangle_sym (di->dso,0 , sym_name); -if (demangled !=NULL ) - sym_name = demangled; - -snprintf (buf, buf_sz,"%s@plt" , sym_name); - -free (demangled); +if (*sym_name =='\0' ) +return false; -return *sym_name; + demangled =demangle_sym (di->dso,0 , sym_name); +if (demangled !=NULL ) { +snprintf (buf, buf_sz,"%s@plt" , demangled); +free (demangled); + }else { +snprintf (buf, buf_sz,"%s@plt" , sym_name); + } +return true; } static int dso__synthesize_plt_got_symbols(struct dso *dso, Elf *elf,
Signature · 1 line
2.40.0.348.gf938b09366-goog
Adrian Hunter
reviewerQuoted 3 lines · Ian Rogers
If demangling succeeds then
sym_nameis set to the demangled string that is freed. Rather than test ifsym_nameis empty and possibly use-after-free on the return path, expand out the alternatives.
Looks the same as:
https://lore.kernel.org/linux-perf-users/[email protected]/
Quoted 36 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/symbol-elf.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)tools/perf/util/symbol-elf.c +10
-8@@ -577,15 +577,17 @@ static bool get_plt_got_name(GElf_Shdr *shdr, size_t i,/* Get the associated symbol */ gelf_getsym (di->dynsym_data, vr->sym_idx, &sym); sym_name =elf_sym__name (&sym, di->dynstr_data); - demangled =demangle_sym (di->dso,0 , sym_name); -if (demangled !=NULL ) - sym_name = demangled; - -snprintf (buf, buf_sz,"%s@plt" , sym_name); - -free (demangled); +if (*sym_name =='\0' ) +return false; -return *sym_name; + demangled =demangle_sym (di->dso,0 , sym_name); +if (demangled !=NULL ) { +snprintf (buf, buf_sz,"%s@plt" , demangled); +free (demangled); + }else { +snprintf (buf, buf_sz,"%s@plt" , sym_name); + } +return true; } static int dso__synthesize_plt_got_symbols(struct dso *dso, Elf *elf,
Ian Rogers
reviewerQuoted 9 lines · Adrian Hunter
Quoted 3 lines · Ian Rogers
If demangling succeeds then
sym_nameis set to the demangled string that is freed. Rather than test ifsym_nameis empty and possibly use-after-free on the return path, expand out the alternatives.Looks the same as:
Sorry for missing that. In the case it returns false, this avoids an unnecessary snprintf.
Thanks,
Ian
Quoted 37 lines
Quoted 36 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/symbol-elf.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)tools/perf/util/symbol-elf.c +10
-8@@ -577,15 +577,17 @@ static bool get_plt_got_name(GElf_Shdr *shdr, size_t i,/* Get the associated symbol */ gelf_getsym (di->dynsym_data, vr->sym_idx, &sym); sym_name =elf_sym__name (&sym, di->dynstr_data); - demangled =demangle_sym (di->dso,0 , sym_name); -if (demangled !=NULL ) - sym_name = demangled; - -snprintf (buf, buf_sz,"%s@plt" , sym_name); - -free (demangled); +if (*sym_name =='\0' ) +return false; -return *sym_name; + demangled =demangle_sym (di->dso,0 , sym_name); +if (demangled !=NULL ) { +snprintf (buf, buf_sz,"%s@plt" , demangled); +free (demangled); + }else { +snprintf (buf, buf_sz,"%s@plt" , sym_name); + } +return true; } static int dso__synthesize_plt_got_symbols(struct dso *dso, Elf *elf,
Arnaldo Carvalho de Melo
maintainerEm Tue, Mar 28, 2023 at 10:35:07PM -0700, Ian Rogers escreveu:
Quoted 7 lines · Adrian Hunter
Quoted 6 lines · Ian Rogers
Quoted 3 lines
If demangling succeeds then
sym_nameis set to the demangled string that is freed. Rather than test ifsym_nameis empty and possibly use-after-free on the return path, expand out the alternatives.
Quoted 6 lines
Quoted 3 lines
Looks the same as:
Sorry for missing that. In the case it returns false, this avoids an unnecessary snprintf.
I applied Adrian's fixes,
- Arnaldo
Quoted 40 lines
Thanks,
IanQuoted 37 lines
Quoted 36 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/symbol-elf.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)tools/perf/util/symbol-elf.c +10
-8@@ -577,15 +577,17 @@ static bool get_plt_got_name(GElf_Shdr *shdr, size_t i,/* Get the associated symbol */ gelf_getsym (di->dynsym_data, vr->sym_idx, &sym); sym_name =elf_sym__name (&sym, di->dynstr_data); - demangled =demangle_sym (di->dso,0 , sym_name); -if (demangled !=NULL ) - sym_name = demangled; - -snprintf (buf, buf_sz,"%s@plt" , sym_name); - -free (demangled); +if (*sym_name =='\0' ) +return false; -return *sym_name; + demangled =demangle_sym (di->dso,0 , sym_name); +if (demangled !=NULL ) { +snprintf (buf, buf_sz,"%s@plt" , demangled); +free (demangled); + }else { +snprintf (buf, buf_sz,"%s@plt" , sym_name); + } +return true; } static int dso__synthesize_plt_got_symbols(struct dso *dso, Elf *elf,
Signature · 1 line
- Arnaldo