clearlinux/graphene
2
0
Fork 0
mirror of https://github.com/clearlinux/graphene.git synced 2026-09-06 13:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup! [LibOS] return error on munmap()/mprotect() for outside of user address

Browse Source
This commit is contained in:
Isaku Yamahata
2020-02-21 00:56:38 -08:00
parent 6f8087071c
commit 32a008dee7
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibOS/shim/src/sys/shim_mmap.c
+8 -8
View File
@@ -161,8 +161,12 @@ int shim_do_mprotect(void* addr, size_t length, int prot) {
if (!IS_ALLOC_ALIGNED(length))
length = ALLOC_ALIGN_UP(length);
if (!completely_within_user_address(addr, length))
return -ENOMEM;
if (!completely_within_user_address(addr, length)) {
/* Pal may load the executable outside of user address. Allow rtld to mprotect it */
if (!(PAL_CB(executable_range.start) <= addr &&
addr + length <= PAL_CB(executable_range.end)))
return -ENOMEM;
}
if (bkeep_mprotect(addr, length, prot, 0) < 0)
return -EPERM;
@@ -187,12 +191,8 @@ int shim_do_munmap(void* addr, size_t length) {
if (!IS_ALLOC_ALIGNED(length))
length = ALLOC_ALIGN_UP(length);
if (!completely_within_user_address(addr, length)) {
/* Pal loads the executable outside of user address. Allow rtld to mprotect it */
if (!(PAL_CB(executable_range.start) <= addr &&
addr + length <= PAL_CB(executable_range.end)))
return -EINVAL;
}
if (!completely_within_user_address(addr, length))
return -EINVAL;
struct shim_vma_val vma;