diff options
| author | Christian Eggers <ceggers@gmx.de> | 2019-11-06 12:29:23 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2019-11-06 12:29:23 +0000 |
| commit | 75802ccb60bfece30005d85de983181afe4e5306 (patch) | |
| tree | 8a1aa2544ebffc855072b83021e2095abd578e9f /binutils | |
| parent | b0a7971ad46c265bd979b17eba3d97a9a63187eb (diff) | |
| download | binutils-gdb-75802ccb60bfece30005d85de983181afe4e5306.tar.gz | |
Fix an off-by-one error in the IN_RANGE macro used by readelf. Add another use of the macro.
* readelf.c (IN_RANGE): Rename parameter OFF to NELEM. Add
comment. Catch potential integer overflow and fix off by one
error whilst checking reloc location against section size.
(apply_relocations): Use IN_RANGE macro.
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 7 | ||||
| -rw-r--r-- | binutils/readelf.c | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 0f5d06b5a69..61a2e0020cc 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,10 @@ +2019-11-06 Christian Eggers <ceggers@gmx.de> + + * readelf.c (IN_RANGE): Rename parameter OFF to NELEM. Add + comment. Catch potential integer overflow and fix off by one + error whilst checking reloc location against section size. + (apply_relocations): Use IN_RANGE macro. + 2019-11-04 Fangrui Song <maskray@google.com> * objcopy.c (enum option_values): Add OPTION_KEEP_SECTION. diff --git a/binutils/readelf.c b/binutils/readelf.c index 370bc4c1b7d..fab8214664c 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -12309,8 +12309,12 @@ process_syminfo (Filedata * filedata ATTRIBUTE_UNUSED) return TRUE; } -#define IN_RANGE(START,END,ADDR,OFF) \ - (((ADDR) >= (START)) && ((ADDR) + (OFF) < (END))) +/* A macro which evaluates to TRUE if the region ADDR .. ADDR + NELEM + is contained by the region START .. END. The types of ADDR, START + and END should all be the same. Note both ADDR + NELEM and END + point to just beyond the end of the regions that are being tested. */ +#define IN_RANGE(START,END,ADDR,NELEM) \ + (((ADDR) >= (START)) && ((ADDR) < (END)) && ((ADDR) + (NELEM) <= (END))) /* Check to see if the given reloc needs to be handled in a target specific manner. If so then process the reloc and return TRUE otherwise return @@ -13411,7 +13415,7 @@ apply_relocations (Filedata * filedata, } rloc = start + rp->r_offset; - if (rloc >= end || (rloc + reloc_size) > end || (rloc < start)) + if (!IN_RANGE (start, end, rloc, reloc_size)) { warn (_("skipping invalid relocation offset 0x%lx in section %s\n"), (unsigned long) rp->r_offset, |