From 92b7bbded238b93fc1021bf8613f2cc4ab59e31a Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 7 Jun 2018 16:57:23 +0200 Subject: [PATCH] libdw: Check DIE address fall inside the CU before reading abbrev code. The afl fuzzer found a case where we tried reading an uleb for the DIE abbrev code without properly checking the DIE address is inside the CU. Signed-off-by: Mark Wielaard --- libdw/ChangeLog | 4 ++++ libdw/libdwP.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libdw/ChangeLog b/libdw/ChangeLog index b000492e3..b56939304 100644 --- a/libdw/ChangeLog +++ b/libdw/ChangeLog @@ -1,3 +1,7 @@ +2018-06-06 Mark Wielaard + + * libdwP.h (__libdw_dieabbrev): Check DIE addr falls in cu. + 2018-06-06 Mark Wielaard * dwarf_getlocation_die.c (dwarf_getlocation_die): Check offset diff --git a/libdw/libdwP.h b/libdw/libdwP.h index 1c8dd0d2a..3d8e145a9 100644 --- a/libdw/libdwP.h +++ b/libdw/libdwP.h @@ -653,7 +653,7 @@ __libdw_dieabbrev (Dwarf_Die *die, const unsigned char **readp) /* Get the abbreviation code. */ unsigned int code; const unsigned char *addr = die->addr; - if (die->cu == NULL) + if (die->cu == NULL || addr >= (const unsigned char *) die->cu->endp) return DWARF_END_ABBREV; get_uleb128 (code, addr, die->cu->endp); if (readp != NULL) -- 2.47.2