diff options
| author | Mark Wielaard <[email protected]> | 2014-12-15 15:34:59 +0100 |
|---|---|---|
| committer | Mark Wielaard <[email protected]> | 2014-12-17 16:43:28 +0100 |
| commit | 2323b45d4ee0c4ff6604b60ee3fca5874c149e18 (patch) | |
| tree | 934152aabd306f4823143de7e8a908e555264bfe /src | |
| parent | 3864804113e31e8372cee725aab84047c790e76d (diff) | |
readelf: Add more bounds checks to print_gdb_index_section.
Signed-off-by: Mark Wielaard <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/readelf.c | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index eaf60f0a..2cf953e6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2014-12-15 Mark Wielaard <[email protected]> + * readelf.c (print_gdb_index_section): Add more bounds checks. + +2014-12-15 Mark Wielaard <[email protected]> + * readelf.c (print_debug_line_section): Check there is enough room for DW_LNE_set_address argument. Make sure there is enough room for the the initial unit_length. diff --git a/src/readelf.c b/src/readelf.c index cd8ba869..41239bca 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -8048,21 +8048,23 @@ print_gdb_index_section (Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr, if (name != 0 || vector != 0) { const unsigned char *sym = data->d_buf + const_off + name; - if (unlikely (sym > dataend)) + if (unlikely (sym > dataend + || memchr (sym, '\0', dataend - sym) == NULL)) goto invalid_data; printf (" [%4zu] symbol: %s, CUs: ", n, sym); const unsigned char *readcus = data->d_buf + const_off + vector; - if (unlikely (readcus + 8 > dataend)) + if (unlikely (readcus + 4 > dataend)) goto invalid_data; - uint32_t cus = read_4ubyte_unaligned (dbg, readcus); while (cus--) { uint32_t cu_kind, cu, kind; bool is_static; readcus += 4; + if (unlikely (readcus + 4 > dataend)) + goto invalid_data; cu_kind = read_4ubyte_unaligned (dbg, readcus); cu = cu_kind & ((1 << 24) - 1); kind = (cu_kind >> 28) & 7; |