Return NULL on corrupt input

PR binutils/17512
	* elf32-i386.c (elf_i386_get_plt_sym_val): Return NULL on corrupt
	input.
	* elf64-x86-64.c (elf_x86_64_get_plt_sym_val): Likewise.
This commit is contained in:
H.J. Lu 2015-01-05 17:43:34 -08:00
parent 9c90714c2f
commit 533d0af0b8
3 changed files with 16 additions and 3 deletions

View File

@ -1,3 +1,10 @@
2015-01-05 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/17512
* elf32-i386.c (elf_i386_get_plt_sym_val): Return NULL on corrupt
input.
* elf64-x86-64.c (elf_x86_64_get_plt_sym_val): Likewise.
2015-01-05 Nick Clifton <nickc@redhat.com>
PR binutils/17512

View File

@ -5194,9 +5194,12 @@ bad_return:
{
long reloc_index;
if (p->howto == NULL /* PR 17512: file: bc9d6cf5. */
|| (p->howto->type != R_386_JUMP_SLOT
&& p->howto->type != R_386_IRELATIVE))
/* PR 17512: file: bc9d6cf5. */
if (p->howto == NULL)
goto bad_return;
if (p->howto->type != R_386_JUMP_SLOT
&& p->howto->type != R_386_IRELATIVE)
continue;
reloc_index = H_GET_32 (abfd, (plt_contents + plt_offset

View File

@ -5559,6 +5559,9 @@ bad_return:
{
long reloc_index;
if (p->howto == NULL)
goto bad_return;
if (p->howto->type != R_X86_64_JUMP_SLOT
&& p->howto->type != R_X86_64_IRELATIVE)
continue;