openharmony/third_party_elfutils
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_elfutils.git synced 2026-07-19 19:43:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

readelf: Make sure print_form_data always consumes DW_FORM_strx[1234] data.

Browse Source 
Found by afl-fuzz. When printing DW_FORM_strx[1234] data eu-readelf didn't
increase readp which meant eu-readelf would keep printing the same line
dirs or files encoded with strx[1234] names. This meant that for insane
large dir or file counts eu-readelf would just keep printing endlessly
because we never reached and of the .debug_line buffer.

Signed-off-by: Mark Wielaard <mark@klomp.org>
This commit is contained in:
Mark Wielaard
2018-06-12 12:22:13 +02:00
parent 29a3395004
commit cfe65047ad
4 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libdw/ChangeLog
+4
View File
@@ -1,3 +1,7 @@
2018-06-12 Mark Wielaard <mark@klomp.org>
* memory-access.h (read_3ubyte_unaligned_inc): New define.
2018-06-12 Mark Wielaard <mark@klomp.org>
* libdw.h (__libdw_dieabbrev): Set die->abbrev to DWARF_END_ABBREV
libdw/memory-access.h
+5
View File
@@ -362,6 +362,11 @@ read_3ubyte_unaligned (Dwarf *dbg, const unsigned char *p)
}
#define read_3ubyte_unaligned_inc(Dbg, Addr) \
({ uint32_t t_ = read_2ubyte_unaligned (Dbg, Addr); \
Addr = (__typeof (Addr)) (((uintptr_t) (Addr)) + 3); \
t_; })
#define read_addr_unaligned_inc(Nbytes, Dbg, Addr) \
(assert ((Nbytes) == 4 || (Nbytes) == 8), \
((Nbytes) == 4 ? read_4ubyte_unaligned_inc (Dbg, Addr) \
src/ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2018-06-12 Mark Wielaard <mark@klomp.org>
* readelf.c (print_form_data): Don't increase strreadp after use.
Do increase readp for DW_FORM_strx[1234].
2018-06-16 Mark Wielaard <mark@klomp.org>
* readelf.c (print_debug_loc_section): Make sure next_off doesn't
src/readelf.c
+6 -6
View File
@@ -8074,9 +8074,9 @@ print_form_data (Dwarf *dbg, int form, const unsigned char *readp,
{
Dwarf_Off idx;
if (offset_len == 8)
idx = read_8ubyte_unaligned_inc (dbg, strreadp);
idx = read_8ubyte_unaligned (dbg, strreadp);
else
idx = read_4ubyte_unaligned_inc (dbg, strreadp);
idx = read_4ubyte_unaligned (dbg, strreadp);
data = dbg->sectiondata[IDX_debug_str];
if (data == NULL || idx >= data->d_size
@@ -8093,25 +8093,25 @@ print_form_data (Dwarf *dbg, int form, const unsigned char *readp,
case DW_FORM_strx1:
if (readendp - readp < 1)
goto invalid_data;
val = *readp;
val = *readp++;
goto strx_val;
case DW_FORM_strx2:
if (readendp - readp < 2)
goto invalid_data;
val = read_2ubyte_unaligned (dbg, readp);
val = read_2ubyte_unaligned_inc (dbg, readp);
goto strx_val;
case DW_FORM_strx3:
if (readendp - readp < 3)
goto invalid_data;
val = read_3ubyte_unaligned (dbg, readp);
val = read_3ubyte_unaligned_inc (dbg, readp);
goto strx_val;
case DW_FORM_strx4:
if (readendp - readp < 4)
goto invalid_data;
val = read_4ubyte_unaligned (dbg, readp);
val = read_4ubyte_unaligned_inc (dbg, readp);
goto strx_val;
default: