ehmry/genode-ehmry
ehmry/genode-ehmry
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libc: return MAP_FAILED if 'mmap()' failed

Browse Source 
Fixes #2924
This commit is contained in:
Christian Prochaska 2018-07-23 14:53:03 +02:00 committed by Christian Helmuth
parent bf8b52ec3a
commit 7fabc45313
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
repos/libports/src/lib/libc/file_operations.cc
View File

@ -430,6 +430,10 @@ extern "C" void *mmap(void *addr, ::size_t length, int prot, int flags,
if (!addr && libc_fd == -1) {
bool const executable = prot & PROT_EXEC;
void *start = Libc::mem_alloc(executable)->alloc(length, PAGE_SHIFT);
if (!start) {
errno = ENOMEM;
return MAP_FAILED;
}
mmap_registry()->insert(start, length, 0);
return start;
}
@ -439,7 +443,7 @@ extern "C" void *mmap(void *addr, ::size_t length, int prot, int flags,
if (!fd || !fd->plugin || !fd->plugin->supports_mmap()) {
Genode::warning("mmap not supported for file descriptor ", libc_fd);
errno = EBADF;
return (void *)INVALID_FD;
return MAP_FAILED;
}
void *start = fd->plugin->mmap(addr, length, prot, flags, fd, offset);