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

sys_munmap: add error check

Browse Source
This commit is contained in:
NAKAMURA Gou
2013-08-08 11:58:54 +09:00
parent 88ce001671
commit 6109eabc23
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
kernel/syscall.c
View File

@@ -477,19 +477,34 @@ out:
SYSCALL_DECLARE(munmap) SYSCALL_DECLARE(munmap)
{ {
void * const addr = (void *)ihk_mc_syscall_arg0(ctx); const uintptr_t addr = ihk_mc_syscall_arg0(ctx);
const size_t len = ihk_mc_syscall_arg1(ctx); const size_t len0 = ihk_mc_syscall_arg1(ctx);
struct process *proc = cpu_local_var(current);
struct vm_regions *region = &proc->vm->region;
size_t len;
int error; int error;
dkprintf("[%d]sys_munmap(%lx,%lx)\n", dkprintf("[%d]sys_munmap(%lx,%lx)\n",
ihk_mc_get_processor_id(), addr, len); ihk_mc_get_processor_id(), addr, len0);
ihk_mc_spinlock_lock_noirq(&cpu_local_var(current)->vm->memory_range_lock); len = (len0 + PAGE_SIZE - 1) & PAGE_MASK;
error = do_munmap(addr, len); if ((addr & (PAGE_SIZE - 1))
ihk_mc_spinlock_unlock_noirq(&cpu_local_var(current)->vm->memory_range_lock); || (addr < region->user_start)
|| (region->user_end <= addr)
|| (len == 0)
|| (len > (region->user_end - region->user_start))
|| ((region->user_end - len) < addr)) {
error = -EINVAL;
goto out;
}
ihk_mc_spinlock_lock_noirq(&proc->vm->memory_range_lock);
error = do_munmap((void *)addr, len);
ihk_mc_spinlock_unlock_noirq(&proc->vm->memory_range_lock);
out:
dkprintf("[%d]sys_munmap(%lx,%lx): %d\n", dkprintf("[%d]sys_munmap(%lx,%lx): %d\n",
ihk_mc_get_processor_id(), addr, len, error); ihk_mc_get_processor_id(), addr, len0, error);
return error; return error;
} }