From: Mark Wielaard Date: Wed, 22 Apr 2015 10:47:46 +0000 (+0200) Subject: readelf: Fix cie_offset calculation comparison on 32bit. X-Git-Tag: elfutils-0.162~83 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=32d5b6f61a90b3c0c777b73eee973d6816a21294;p=thirdparty%2Felfutils.git readelf: Fix cie_offset calculation comparison on 32bit. gcc -fsanitize=undefined pointed out that on 32bit systems the calculation to match the cie_offset to the cie_id could be undefined because a cie_id could be an unsigned 64bit value while ptrdiff_t is only 32bits. Correct the calculation to use 64bit values. Signed-off-by: Mark Wielaard --- diff --git a/src/ChangeLog b/src/ChangeLog index 40a0e6f97..a4ac4e469 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2015-03-22 Mark Wielaard + + * readelf.c (print_debug_frame_section): Cast start to Dwarf_Off + before subtracting cie_id. And cast cie_offset to Dwarf_Off before + comparison. + 2015-03-22 Mark Wielaard * readelf.c (print_gdb_index_section): Check all offsets used diff --git a/src/readelf.c b/src/readelf.c index 26c7eedb5..b4cb3a827 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -5619,8 +5619,8 @@ print_debug_frame_section (Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr, struct cieinfo *cie = cies; while (cie != NULL) if (is_eh_frame - ? start - (ptrdiff_t) cie_id == cie->cie_offset - : (ptrdiff_t) cie_id == cie->cie_offset) + ? ((Dwarf_Off) start - cie_id) == (Dwarf_Off) cie->cie_offset + : cie_id == (Dwarf_Off) cie->cie_offset) break; else cie = cie->next;