gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmap: return -ENOMEM if speicified range is out of range

Browse Source
This commit is contained in:
NAKAMURA Gou
2016-03-15 13:45:54 +09:00
parent 81690c5b5a
commit 15f572ef9c
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/x86/kernel/syscall.c
View File

@ -1260,11 +1260,7 @@ SYSCALL_DECLARE(mmap)
addr = (flags & MAP_FIXED)? addr0: VALID_DUMMY_ADDR; addr = (flags & MAP_FIXED)? addr0: VALID_DUMMY_ADDR;
len = (len0 + PAGE_SIZE - 1) & PAGE_MASK; len = (len0 + PAGE_SIZE - 1) & PAGE_MASK;
if ((addr & (PAGE_SIZE - 1)) if ((addr & (PAGE_SIZE - 1))
|| (addr < region->user_start)
|| (region->user_end <= addr)
|| (len == 0) || (len == 0)
|| (len > (region->user_end - region->user_start))
|| ((region->user_end - len) < addr)
|| !(flags & (MAP_SHARED | MAP_PRIVATE)) || !(flags & (MAP_SHARED | MAP_PRIVATE))
|| ((flags & MAP_SHARED) && (flags & MAP_PRIVATE)) || ((flags & MAP_SHARED) && (flags & MAP_PRIVATE))
|| (off0 & (PAGE_SIZE - 1))) { || (off0 & (PAGE_SIZE - 1))) {
@ -1274,6 +1270,15 @@ SYSCALL_DECLARE(mmap)
goto out; goto out;
} }
if ((addr < region->user_start)
|| (region->user_end <= addr)
|| ((region->user_end - addr) < len)) {
ekprintf("sys_mmap(%lx,%lx,%x,%x,%x,%lx):ENOMEM\n",
addr0, len0, prot, flags, fd, off0);
error = -ENOMEM;
goto out;
}
/* check not supported requests */ /* check not supported requests */
if ((flags & error_flags) if ((flags & error_flags)
|| (flags & ~(supported_flags | ignored_flags))) { || (flags & ~(supported_flags | ignored_flags))) {