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

Revert "fix REQ-42"

Browse Source 
This reverts commit 4a0682bbc1.

The reverted commit appears to be wrong, for example:
- arch_range_check()'s arguments and parameters are mismatch.
- arch_range_check() implementation is not checking range.

Conflicts:
	kernel/syscall.c
This commit is contained in:
NAKAMURA Gou
2016-03-28 13:37:47 +09:00
parent 6790126a23
commit a2548f5421
2 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1278,18 +1278,6 @@ set_signal(int sig, void *regs0, siginfo_t *info)
do_kill(thread, thread->proc->pid, thread->tid, sig, info, 0); do_kill(thread, thread->proc->pid, thread->tid, sig, info, 0);
} }
int
arch_range_check(unsigned long addr)
{
struct thread *thread = cpu_local_var(current);
struct vm_regions *region = &thread->vm->region;
if(addr < region->user_start ||
addr > region->user_end)
return -EINVAL;
return 0;
}
SYSCALL_DECLARE(mmap) SYSCALL_DECLARE(mmap)
{ {
const int supported_flags = 0 const int supported_flags = 0

17
kernel/syscall.c
View File

@ -113,7 +113,6 @@ extern int ptrace_detach(int pid, int data);
extern void debug_log(unsigned long); extern void debug_log(unsigned long);
extern void free_all_process_memory_range(struct process_vm *vm); extern void free_all_process_memory_range(struct process_vm *vm);
extern int arch_clear_host_user_space(); extern int arch_clear_host_user_space();
extern int arch_range_check(unsigned long addr, unsigned long len);
extern long arch_ptrace(long request, int pid, long addr, long data); extern long arch_ptrace(long request, int pid, long addr, long data);
extern struct cpu_local_var *clv; extern struct cpu_local_var *clv;
@ -1190,6 +1189,7 @@ SYSCALL_DECLARE(munmap)
const uintptr_t addr = ihk_mc_syscall_arg0(ctx); const uintptr_t addr = ihk_mc_syscall_arg0(ctx);
const size_t len0 = ihk_mc_syscall_arg1(ctx); const size_t len0 = ihk_mc_syscall_arg1(ctx);
struct thread *thread = cpu_local_var(current); struct thread *thread = cpu_local_var(current);
struct vm_regions *region = &thread->vm->region;
size_t len; size_t len;
int error; int error;
@ -1198,8 +1198,11 @@ SYSCALL_DECLARE(munmap)
len = (len0 + PAGE_SIZE - 1) & PAGE_MASK; len = (len0 + PAGE_SIZE - 1) & PAGE_MASK;
if ((addr & (PAGE_SIZE - 1)) if ((addr & (PAGE_SIZE - 1))
|| arch_range_check(addr, len) || (addr < region->user_start)
|| len <= 0) { || (region->user_end <= addr)
|| (len == 0)
|| (len > (region->user_end - region->user_start))
|| ((region->user_end - len) < addr)) {
error = -EINVAL; error = -EINVAL;
goto out; goto out;
} }
@ -1220,6 +1223,7 @@ SYSCALL_DECLARE(mprotect)
const size_t len0 = ihk_mc_syscall_arg1(ctx); const size_t len0 = ihk_mc_syscall_arg1(ctx);
const int prot = ihk_mc_syscall_arg2(ctx); const int prot = ihk_mc_syscall_arg2(ctx);
struct thread *thread = cpu_local_var(current); struct thread *thread = cpu_local_var(current);
struct vm_regions *region = &thread->vm->region;
size_t len; size_t len;
intptr_t end; intptr_t end;
struct vm_range *first; struct vm_range *first;
@ -1244,7 +1248,9 @@ SYSCALL_DECLARE(mprotect)
return -EINVAL; return -EINVAL;
} }
if (arch_range_check(start, len)) { if ((start < region->user_start)
|| (region->user_end <= start)
|| ((region->user_end - start) < len)) {
ekprintf("[%d]sys_mprotect(%lx,%lx,%x): -ENOMEM\n", ekprintf("[%d]sys_mprotect(%lx,%lx,%x): -ENOMEM\n",
ihk_mc_get_processor_id(), start, len0, prot); ihk_mc_get_processor_id(), start, len0, prot);
return -ENOMEM; return -ENOMEM;
@ -6379,8 +6385,7 @@ SYSCALL_DECLARE(mremap)
error); error);
goto out; goto out;
} }
if (((newstart < oldend) && (oldstart < newend)) || if ((newstart < oldend) && (oldstart < newend)) {
arch_range_check(newstart, newsize)) {
error = -EINVAL; error = -EINVAL;
ekprintf("sys_mremap(%#lx,%#lx,%#lx,%#x,%#lx):" ekprintf("sys_mremap(%#lx,%#lx,%#lx,%#x,%#lx):"
"fixed:overlapped. %d\n", "fixed:overlapped. %d\n",