diff options
author | Nick Clifton <nickc@redhat.com> | 2018-11-30 11:43:12 +0000 |
---|---|---|
committer | Nick Clifton <nickc@redhat.com> | 2018-11-30 11:43:12 +0000 |
commit | beab453223769279cc1cef68a1622ab8978641f7 (patch) | |
tree | b93c05695f7ee792cef528584a80e8f4a13bc9aa /bfd/elf.c | |
parent | ba85c15dabe144e4bcee5a1b388b32bee10729e1 (diff) | |
download | gdb-beab453223769279cc1cef68a1622ab8978641f7.zip gdb-beab453223769279cc1cef68a1622ab8978641f7.tar.gz gdb-beab453223769279cc1cef68a1622ab8978641f7.tar.bz2 |
Remove an abort in the bfd library and add a check for an integer overflow when mapping sections to segments.
PR 23932
* elf.c (IS_CONTAINED_BY_LMA): Add a check for a negative section
size.
(rewrite_elf_program_header): If no sections are mapped into a
segment return an error.
Diffstat (limited to 'bfd/elf.c')
-rw-r--r-- | bfd/elf.c | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -6644,6 +6644,7 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd) the given segment. LMA addresses are compared. */ #define IS_CONTAINED_BY_LMA(section, segment, base) \ (section->lma >= base \ + && (section->lma + SECTION_SIZE (section, segment) >= section->lma) \ && (section->lma + SECTION_SIZE (section, segment) \ <= SEGMENT_END (segment, base))) @@ -7167,7 +7168,15 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd) suggested_lma = output_section; } - BFD_ASSERT (map->count > 0); + /* PR 23932. A corrupt input file may contain sections that cannot + be assigned to any segment - because for example they have a + negative size - or segments that do not contain any sections. */ + if (map->count == 0) + { + bfd_set_error (bfd_error_bad_value); + free (sections); + return FALSE; + } /* Add the current segment to the list of built segments. */ *pointer_to_map = map; |