diff options
| -rw-r--r-- | libdw/ChangeLog | 5 | ||||
| -rw-r--r-- | libdw/dwarf_getaranges.c | 4 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/readelf.c | 2 |
4 files changed, 16 insertions, 0 deletions
diff --git a/libdw/ChangeLog b/libdw/ChangeLog index cb4f34ed..472d9228 100644 --- a/libdw/ChangeLog +++ b/libdw/ChangeLog @@ -1,3 +1,8 @@ +2018-08-18 Mark Wielaard <mark@klomp.org> + + * dwarf_getaranges.c (dwarf_getaranges.c): Make sure there is enough + data to read the address and segment size. + 2018-07-04 Ross Burton <ross.burton@intel.com> * libdw_alloc.c: Remove error.h include. diff --git a/libdw/dwarf_getaranges.c b/libdw/dwarf_getaranges.c index bff9c860..de5b81ba 100644 --- a/libdw/dwarf_getaranges.c +++ b/libdw/dwarf_getaranges.c @@ -148,6 +148,10 @@ dwarf_getaranges (Dwarf *dbg, Dwarf_Aranges **aranges, size_t *naranges) length_bytes, &offset, IDX_debug_info, 4)) goto fail; + /* Next up two bytes for address and segment size. */ + if (readp + 2 > readendp) + goto invalid; + unsigned int address_size = *readp++; if (unlikely (address_size != 4 && address_size != 8)) goto invalid; diff --git a/src/ChangeLog b/src/ChangeLog index 8c89f83d..2f9f7747 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2018-08-18 Mark Wielaard <mark@klomp.org> + * readelf.c (print_debug_aranges_section): Make sure there is enough + data to read the header segment size. + +2018-08-18 Mark Wielaard <mark@klomp.org> + * elflint.c (check_sysv_hash): Calculate needed size using unsigned long long int to prevent overflow. (check_sysv_hash64): Calculate maxwords used separately before diff --git a/src/readelf.c b/src/readelf.c index 7b5707f8..7b488ac5 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -5447,6 +5447,8 @@ print_debug_aranges_section (Dwfl_Module *dwflmod __attribute__ ((unused)), goto next_table; } + if (readp + 1 > readendp) + goto invalid_data; unsigned int segment_size = *readp++; printf (gettext (" Segment size: %6" PRIu64 "\n\n"), (uint64_t) segment_size); |