diff options
| author | Maciej W. Rozycki <macro@mips.com> | 2018-04-04 02:00:49 +0100 |
|---|---|---|
| committer | Maciej W. Rozycki <macro@mips.com> | 2018-04-04 02:00:49 +0100 |
| commit | 0cc919dc6abede5e61b9d8234028fba879166088 (patch) | |
| tree | 47cdf5670918bff8328d8f28bdc5a5c1696c0b45 /bfd | |
| parent | f428698edfd845a21639f5145cba3772eb92abc2 (diff) | |
| download | binutils-gdb-0cc919dc6abede5e61b9d8234028fba879166088.tar.gz | |
PR binutils/22875: IQ2000/ELF: Prevent an out-of-bounds howto table access
Prevent an out-of-bounds `iq2000_elf_howto_table' table access in
`iq2000_info_to_howto_rela' by using the size of the table rather than
R_IQ2000_max to determine the number of entries in the contiguous
regular IQ2000 relocation range defined and described in the table.
bfd/
* elf32-iq2000.c (iq2000_info_to_howto_rela): Correct the range
check for `iq2000_elf_howto_table' table access.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf32-iq2000.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 072ad98a774..8e1df6d0ff3 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,10 @@ 2018-04-04 Maciej W. Rozycki <macro@mips.com> + * elf32-iq2000.c (iq2000_info_to_howto_rela): Correct the range + check for `iq2000_elf_howto_table' table access. + +2018-04-04 Maciej W. Rozycki <macro@mips.com> + * elf32-frv.c (frv_info_to_howto_rela): Correct the range check for `elf32_frv_howto_table' table access. diff --git a/bfd/elf32-iq2000.c b/bfd/elf32-iq2000.c index d1ce3c8b4cc..e616766ad46 100644 --- a/bfd/elf32-iq2000.c +++ b/bfd/elf32-iq2000.c @@ -22,6 +22,7 @@ #include "libbfd.h" #include "elf-bfd.h" #include "elf/iq2000.h" +#include "libiberty.h" /* Forward declarations. */ @@ -435,7 +436,7 @@ iq2000_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED, break; default: - if (r_type >= (unsigned int) R_IQ2000_max) + if (r_type >= ARRAY_SIZE (iq2000_elf_howto_table)) { /* xgettext:c-format */ _bfd_error_handler (_("%pB: unsupported relocation type %#x"), |