OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Christian Eggers 2019-11-06 12:29:23 +00:00 committed by Nick Clifton
parent b0a7971ad4
commit 75802ccb60
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
binutils/ChangeLog
View File

@ -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.

10
binutils/readelf.c
View File

@ -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,