mirrors/binutils-gdb
0
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-28 20:43:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

readelf PT_PHDR check

Browse Source 
When PT_PHDR isn't covered by a PT_LOAD header, p_vaddr in PT_PHDR
isn't valid but the value might just pass a vaddr test.  So test
p_offset as well.

	* readelf.c (process_program_headers): Check PT_PHDR p_offset
	as well as p_vaddr.  Use p_filesz, not p_memsz, in vaddr test.
This commit is contained in:
Alan Modra 2019-10-25 12:21:35 +10:30
parent e2ffdcea6c
commit c0c121b01c
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
binutils/ChangeLog
View File

@ -1,3 +1,8 @@
2019-10-25 Alan Modra <amodra@gmail.com>
* readelf.c (process_program_headers): Check PT_PHDR p_offset
as well as p_vaddr. Use p_filesz, not p_memsz, in vaddr test.
2019-10-21 Alan Modra <amodra@gmail.com>
PR 452

16
binutils/readelf.c
View File

@ -5262,11 +5262,17 @@ process_program_headers (Filedata * filedata)
unsigned int j;
for (j = 1; j < filedata->file_header.e_phnum; j++)
if (filedata->program_headers[j].p_vaddr <= segment->p_vaddr
&& (filedata->program_headers[j].p_vaddr
+ filedata->program_headers[j].p_memsz)
>= (segment->p_vaddr + segment->p_filesz))
break;
{
Elf_Internal_Phdr *load = filedata->program_headers + j;
if (load->p_type == PT_LOAD
&& load->p_offset <= segment->p_offset
&& (load->p_offset + load->p_filesz
>= segment->p_offset + segment->p_filesz)
&& load->p_vaddr <= segment->p_vaddr
&& (load->p_vaddr + load->p_filesz
>= segment->p_vaddr + segment->p_filesz))
break;
}
if (j == filedata->file_header.e_phnum)
error (_("the PHDR segment is not covered by a LOAD segment\n"));
}