mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix elf loader range checking

Browse Source 
The ELF loader tracks the range of addresses used by a binary.
However this incorrectly assumes zero is not a valid address.

Signed-off-by: Paul Brook <paul@codesourcery.com>
This commit is contained in:
Paul Brook 2009-06-05 15:16:41 +01:00
parent bdb11366b9
commit fd93a79999
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
elf_ops.h
View File

@ -185,7 +185,7 @@ static int glue(load_elf, SZ)(int fd, int64_t address_offset,
struct elf_phdr *phdr = NULL, *ph;
int size, i, total_size;
elf_word mem_size;
uint64_t addr, low = 0, high = 0;
uint64_t addr, low = (uint64_t)-1, high = 0;
uint8_t *data = NULL;
if (read(fd, &ehdr, sizeof(ehdr)) != sizeof(ehdr))
@ -249,9 +249,9 @@ static int glue(load_elf, SZ)(int fd, int64_t address_offset,
cpu_physical_memory_write_rom(addr, data, mem_size);
total_size += mem_size;
if (!low || addr < low)
if (addr < low)
low = addr;
if (!high || (addr + mem_size) > high)
if ((addr + mem_size) > high)
high = addr + mem_size;
qemu_free(data);