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

Make target_mmap always return -1 on failure.

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1741 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
pbrook 2006-02-04 20:46:24 +00:00
parent 06c949e62a
commit e89f07d384
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-user/elfload.c
View File

@ -890,7 +890,7 @@ static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex,
interpreter_fd, interpreter_fd,
eppnt->p_offset - TARGET_ELF_PAGEOFFSET(eppnt->p_vaddr)); eppnt->p_offset - TARGET_ELF_PAGEOFFSET(eppnt->p_vaddr));
if (error > -1024UL) { if (error == -1) {
/* Real error */ /* Real error */
close(interpreter_fd); close(interpreter_fd);
free(elf_phdata); free(elf_phdata);

18
linux-user/mmap.c
View File

@ -183,8 +183,10 @@ long target_mmap(unsigned long start, unsigned long len, int prot,
} }
#endif #endif
if (offset & ~TARGET_PAGE_MASK) if (offset & ~TARGET_PAGE_MASK) {
return -EINVAL; errno = EINVAL;
return -1;
}
len = TARGET_PAGE_ALIGN(len); len = TARGET_PAGE_ALIGN(len);
if (len == 0) if (len == 0)
@ -232,8 +234,10 @@ long target_mmap(unsigned long start, unsigned long len, int prot,
} }
} }
if (start & ~TARGET_PAGE_MASK) if (start & ~TARGET_PAGE_MASK) {
return -EINVAL; errno = EINVAL;
return -1;
}
end = start + len; end = start + len;
host_end = HOST_PAGE_ALIGN(end); host_end = HOST_PAGE_ALIGN(end);
@ -244,8 +248,10 @@ long target_mmap(unsigned long start, unsigned long len, int prot,
/* msync() won't work here, so we return an error if write is /* msync() won't work here, so we return an error if write is
possible while it is a shared mapping */ possible while it is a shared mapping */
if ((flags & MAP_TYPE) == MAP_SHARED && if ((flags & MAP_TYPE) == MAP_SHARED &&
(prot & PROT_WRITE)) (prot & PROT_WRITE)) {
return -EINVAL; errno = EINVAL;
return -1;
}
retaddr = target_mmap(start, len, prot | PROT_WRITE, retaddr = target_mmap(start, len, prot | PROT_WRITE,
MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS,
-1, 0); -1, 0);