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

sys_mprotect: delete unnecessary error check

Browse Source
This commit is contained in:
NAKAMURA Gou
2013-07-30 13:41:25 +09:00
parent 6109eabc23
commit b0de24f13e
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
kernel/syscall.c
View File

@@ -549,6 +549,7 @@ SYSCALL_DECLARE(mprotect)
ihk_mc_spinlock_lock_noirq(&proc->vm->memory_range_lock); ihk_mc_spinlock_lock_noirq(&proc->vm->memory_range_lock);
begin_free_pages_pending(); begin_free_pages_pending();
#if 0
/* check contiguous map */ /* check contiguous map */
first = NULL; first = NULL;
for (addr = start; addr < end; addr = range->end) { for (addr = start; addr < end; addr = range->end) {
@@ -575,6 +576,9 @@ SYSCALL_DECLARE(mprotect)
goto out; goto out;
} }
} }
#else
first = lookup_process_memory_range(proc->vm, start, start+PAGE_SIZE);
#endif
/* do the mprotect */ /* do the mprotect */
changed = NULL; changed = NULL;
@@ -585,11 +589,20 @@ SYSCALL_DECLARE(mprotect)
else { else {
range = next_process_memory_range(proc->vm, changed); range = next_process_memory_range(proc->vm, changed);
} }
if (range == NULL) {
ekprintf("sys_mprotect(%lx,%lx,%x):next(%lx) failed.\n", if ((range == NULL) || (addr < range->start)) {
start, len0, prot, /* not contiguous */
(changed)? changed->end: -1); ekprintf("sys_mprotect(%lx,%lx,%x):not contiguous\n",
panic("sys_mprotect:next\n"); start, len0, prot);
error = -ENOMEM;
goto out;
}
if (range->flag & (VR_REMOTE | VR_RESERVED | VR_IO_NOCACHE)) {
ekprintf("sys_mprotect(%lx,%lx,%x):cannot change\n",
start, len0, prot);
error = -ENOMEM;
goto out;
} }
if (range->start < addr) { if (range->start < addr) {