diff options
| author | Nick Clifton <nickc@redhat.com> | 2017-04-03 12:14:06 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2017-04-03 12:14:06 +0100 |
| commit | 82156ab704b08b124d319c0decdbd48b3ca2dac5 (patch) | |
| tree | 942d5f78b2d3693e478cee3c603fb8332c4902b1 /binutils | |
| parent | 75ec1fdbb797a389e4fe4aaf2e15358a070dcc19 (diff) | |
| download | fsf-binutils-gdb-82156ab704b08b124d319c0decdbd48b3ca2dac5.zip fsf-binutils-gdb-82156ab704b08b124d319c0decdbd48b3ca2dac5.tar.gz fsf-binutils-gdb-82156ab704b08b124d319c0decdbd48b3ca2dac5.tar.bz2 | |
readelf: Fix overlarge memory allocation when reading a binary with an excessive number of program headers.
PR binutils/21345
* readelf.c (get_program_headers): Check for there being too many
program headers before attempting to allocate space for them.
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 6 | ||||
| -rw-r--r-- | binutils/readelf.c | 17 |
2 files changed, 20 insertions, 3 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 438ea7f..5d81b35 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,11 @@ 2017-04-03 Nick Clifton <nickc@redhat.com> + PR binutils/21345 + * readelf.c (get_program_headers): Check for there being too many + program headers before attempting to allocate space for them. + +2017-04-03 Nick Clifton <nickc@redhat.com> + PR binutils/21344 * readelf.c (process_mips_specific): Check for an out of range GOT entry before reading the module pointer. diff --git a/binutils/readelf.c b/binutils/readelf.c index 3665221..b573921 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -4794,9 +4794,19 @@ get_program_headers (FILE * file) if (program_headers != NULL) return TRUE; - phdrs = (Elf_Internal_Phdr *) cmalloc (elf_header.e_phnum, - sizeof (Elf_Internal_Phdr)); + /* Be kind to memory checkers by looking for + e_phnum values which we know must be invalid. */ + if (elf_header.e_phnum + * (is_32bit_elf ? sizeof (Elf32_External_Phdr) : sizeof (Elf64_External_Phdr)) + >= current_file_size) + { + error (_("Too many program headers - %#x - the file is not that big\n"), + elf_header.e_phnum); + return FALSE; + } + phdrs = (Elf_Internal_Phdr *) cmalloc (elf_header.e_phnum, + sizeof (Elf_Internal_Phdr)); if (phdrs == NULL) { error (_("Out of memory reading %u program headers\n"), @@ -15470,7 +15480,8 @@ process_mips_specific (FILE * file) /* PR 21344 */ if (data + ent - pltgot > data_end - addr_size) { - error (_("Invalid got entry - %#lx - overflows GOT table\n"), ent); + error (_("Invalid got entry - %#lx - overflows GOT table\n"), + (long) ent); goto got_print_fail; } |