FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

readelf: Fix overlarge memory allocation when reading a binary with an excessive number of program headers.

Browse source 
PR binutils/21345
	* readelf.c (get_program_headers): Check for there being too many
	program headers before attempting to allocate space for them.
This commit is contained in:
Nick Clifton 2017-04-03 12:14:06 +01:00
parent 75ec1fdbb7
commit 82156ab704
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
binutils/ChangeLog
View file

@ -1,3 +1,9 @@
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> 2017-04-03 Nick Clifton <nickc@redhat.com>
PR binutils/21344 PR binutils/21344

17
binutils/readelf.c
View file

@ -4794,9 +4794,19 @@ get_program_headers (FILE * file)
if (program_headers != NULL) if (program_headers != NULL)
return TRUE; return TRUE;
phdrs = (Elf_Internal_Phdr *) cmalloc (elf_header.e_phnum, /* Be kind to memory checkers by looking for
sizeof (Elf_Internal_Phdr)); 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) if (phdrs == NULL)
{ {
error (_("Out of memory reading %u program headers\n"), error (_("Out of memory reading %u program headers\n"),
@ -15470,7 +15480,8 @@ process_mips_specific (FILE * file)
/* PR 21344 */ /* PR 21344 */
if (data + ent - pltgot > data_end - addr_size) 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; goto got_print_fail;
} }