From 8fb879cd16a3e3d1fe93e333c4c720fd33bcc416 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 12 Mar 2020 16:48:07 +1030 Subject: [PATCH] asan: readelf leaks * readelf.c (process_section_headers): Don't just set filedata->section_headers NULL, free it first. Similarly for dynamic_symbols, dynamic_strings, dynamic_syminfo and symtab_shndx_list. Zero associated counts too. (process_object): Free symtab_shndx_list. (process_file): Free various allocated filedata tables. --- binutils/ChangeLog | 9 +++++++++ binutils/readelf.c | 24 +++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 9f54fa1f1c3..51a21bf9e9f 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,12 @@ +2020-03-12 Alan Modra + + * readelf.c (process_section_headers): Don't just set + filedata->section_headers NULL, free it first. Similarly for + dynamic_symbols, dynamic_strings, dynamic_syminfo and + symtab_shndx_list. Zero associated counts too. + (process_object): Free symtab_shndx_list. + (process_file): Free various allocated filedata tables. + 2020-03-11 Nick Clifton PR 25611 diff --git a/binutils/readelf.c b/binutils/readelf.c index 260ea33ba4c..d009b91920b 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -6117,6 +6117,7 @@ process_section_headers (Filedata * filedata) Elf_Internal_Shdr * section; unsigned int i; + free (filedata->section_headers); filedata->section_headers = NULL; if (filedata->file_header.e_shnum == 0) @@ -6172,10 +6173,20 @@ process_section_headers (Filedata * filedata) /* Scan the sections for the dynamic symbol table and dynamic string table and debug sections. */ + free (dynamic_symbols); dynamic_symbols = NULL; + num_dynamic_syms = 0; + free (dynamic_strings); dynamic_strings = NULL; + dynamic_strings_length = 0; + free (dynamic_syminfo); dynamic_syminfo = NULL; - symtab_shndx_list = NULL; + while (symtab_shndx_list != NULL) + { + elf_section_list *next = symtab_shndx_list->next; + free (symtab_shndx_list); + symtab_shndx_list = next; + } eh_addr_size = is_32bit_elf ? 4 : 8; switch (filedata->file_header.e_machine) @@ -20121,6 +20132,13 @@ process_object (Filedata * filedata) dynamic_section = NULL; } + while (symtab_shndx_list != NULL) + { + elf_section_list *next = symtab_shndx_list->next; + free (symtab_shndx_list); + symtab_shndx_list = next; + } + if (section_headers_groups) { free (section_headers_groups); @@ -20486,6 +20504,10 @@ process_file (char * file_name) } fclose (filedata->handle); + free (filedata->section_headers); + free (filedata->program_headers); + free (filedata->string_table); + free (filedata->dump_sects); free (filedata); return ret; -- 2.30.2