diff options
| author | Alan Modra <amodra@gmail.com> | 2016-02-01 21:27:02 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2016-02-01 21:27:02 +1030 |
| commit | ec1f73bb0be7482f2dffd9bbca2f93fc74eca172 (patch) | |
| tree | 3511f9c6fa640f08cbae69b7b0b2ebc3319dc6f7 /bfd/elf64-x86-64.c | |
| parent | d8c823c8b62b4f0fc4747eb9e4e29739add34c17 (diff) | |
| download | binutils-ec1f73bb0be7482f2dffd9bbca2f93fc74eca172.zip binutils-ec1f73bb0be7482f2dffd9bbca2f93fc74eca172.tar.gz binutils-ec1f73bb0be7482f2dffd9bbca2f93fc74eca172.tar.bz2 | |
x86 synthetic plt symbols
Changing "pushq $1" in the following to "pushq $too_big" results in an
abort. BFD shouldn't abort on (deliberately) bad user input.
400480: ff 25 9a 0b 20 00 jmpq *0x200b9a(%rip)
400486: 68 01 00 00 00 pushq $0x1
40048b: e9 d0 ff ff ff jmpq 400460 <_init+0x20>
* elf64-x86-64.c (elf_x86_64_get_plt_sym_val): Don't abort on
an out of range reloc_index.
* elf32-i386.c (elf_i386_get_plt_sym_val): Likewise.
Diffstat (limited to 'bfd/elf64-x86-64.c')
| -rw-r--r-- | bfd/elf64-x86-64.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 37528be..88ed00e 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -6066,19 +6066,20 @@ bad_return: reloc_index = H_GET_32 (abfd, (plt_contents + plt_offset + bed->plt_reloc_offset)); - if (reloc_index >= count) - abort (); - if (plt_bnd) + if (reloc_index < count) { - /* This is the index in .plt section. */ - long plt_index = plt_offset / bed->plt_entry_size; - /* Store VMA + the offset in .plt.bnd section. */ - plt_sym_val[reloc_index] = - (plt_bnd->vma - + (plt_index - 1) * sizeof (elf_x86_64_legacy_plt2_entry)); + if (plt_bnd) + { + /* This is the index in .plt section. */ + long plt_index = plt_offset / bed->plt_entry_size; + /* Store VMA + the offset in .plt.bnd section. */ + plt_sym_val[reloc_index] = + (plt_bnd->vma + + (plt_index - 1) * sizeof (elf_x86_64_legacy_plt2_entry)); + } + else + plt_sym_val[reloc_index] = plt->vma + plt_offset; } - else - plt_sym_val[reloc_index] = plt->vma + plt_offset; plt_offset += bed->plt_entry_size; /* PR binutils/18437: Skip extra relocations in the .rela.plt |