aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorJose E. Marchesi <jose.marchesi@oracle.com>2018-09-04 19:02:38 +0200
committerJose E. Marchesi <jose.marchesi@oracle.com>2018-09-04 20:31:41 +0200
commit8410d65b77164d020a45cc9aa17a0147dc76862d (patch)
tree1eacc7d452d53f26dc49d1000ab2501e42611fab /bfd
parentfcc9b044b7f563023633a9964810e76f4cde40d4 (diff)
downloadbinutils-8410d65b77164d020a45cc9aa17a0147dc76862d.zip
binutils-8410d65b77164d020a45cc9aa17a0147dc76862d.tar.gz
binutils-8410d65b77164d020a45cc9aa17a0147dc76862d.tar.bz2
bfd, sparc: issue an error when reading relocations with invalid symbol references.
The function `elf64_sparc_slurp_one_reloc_table' in elf64-sparc.c currently checks that the symbol indexes read in the r_sym fields of relocations are in range. This is done for both dynamic and non-dynamic symbols. This avoids subsequent invalid memory accesses. However, no error is issued to the user. This patch makes BFD to issue an error when the read symbol index is out of range, following the same behavior implemented in both the generic ELF routines and other ELF backends (such as mips64). Tested in x86_64-linux-gnu, sparc64-linux-gnu, and --enable-targets=all. 2018-09-04 Jose E. Marchesi <jose.marchesi@oracle.com> * elf64-sparc.c (elf64_sparc_slurp_one_reloc_table): Issue an error when an invalid symbol index is retrieved in ELF64_R_SYM of a relocation seen in an input file.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf64-sparc.c18
2 files changed, 19 insertions, 5 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9a3b9b1..22837e0 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2018-09-04 Jose E. Marchesi <jose.marchesi@oracle.com>
+
+ * elf64-sparc.c (elf64_sparc_slurp_one_reloc_table): Issue an
+ error when an invalid symbol index is retrieved in ELF64_R_SYM of
+ a relocation seen in an input file.
+
2018-09-03 Jozef Lawrynowicz <jozef.l@mittosystems.com>
Alan Modra <amodra@gmail.com>
diff --git a/bfd/elf64-sparc.c b/bfd/elf64-sparc.c
index 8c45d32..41e1b7a 100644
--- a/bfd/elf64-sparc.c
+++ b/bfd/elf64-sparc.c
@@ -97,12 +97,20 @@ elf64_sparc_slurp_one_reloc_table (bfd *abfd, asection *asect,
else
relent->address = rela.r_offset - asect->vma;
- if (ELF64_R_SYM (rela.r_info) == STN_UNDEF
- /* PR 17512: file: 996185f8. */
- || (!dynamic && ELF64_R_SYM(rela.r_info) > bfd_get_symcount(abfd))
- || (dynamic
- && ELF64_R_SYM(rela.r_info) > bfd_get_dynamic_symcount(abfd)))
+ if (ELF64_R_SYM (rela.r_info) == STN_UNDEF)
relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+ else if (/* PR 17512: file: 996185f8. */
+ (!dynamic && ELF64_R_SYM(rela.r_info) > bfd_get_symcount(abfd))
+ || (dynamic
+ && ELF64_R_SYM(rela.r_info) > bfd_get_dynamic_symcount(abfd)))
+ {
+ _bfd_error_handler
+ /* xgettext:c-format */
+ (_("%pB(%pA): relocation %d has invalid symbol index %ld"),
+ abfd, asect, i, (long) ELF64_R_SYM (rela.r_info));
+ bfd_set_error (bfd_error_bad_value);
+ relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+ }
else
{
asymbol **ps, *s;