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

execve: use thread variable instead of cpu_local_var(current)

Browse Source 
This fixes crashes _without_ oversubscribing with a process doing
fork() execve() / wait() in a loop

Issue: #1132
Change-Id: I98531f4643ad6b6a8f750a1a3f05b9ff3ebfd50f
This commit is contained in:
Dominique Martinet
2018-06-18 14:24:44 +09:00
committed by Masamichi Takagi
parent a6ac4acf40
commit d4471df94e
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/syscall.c
View File

@ -2237,21 +2237,20 @@ SYSCALL_DECLARE(execve)
goto end; goto end;
} }
if (cpu_local_var(current)->proc->ptrace) { if (thread->proc->ptrace) {
ihk_mc_syscall_ret(ctx) = 0; ihk_mc_syscall_ret(ctx) = 0;
ptrace_syscall_event(cpu_local_var(current)); ptrace_syscall_event(thread);
} }
/* Unmap all memory areas of the process, userspace will be gone */ /* Unmap all memory areas of the process, userspace will be gone */
munmap_all(); munmap_all();
ihk_mc_init_user_process(&cpu_local_var(current)->ctx, ihk_mc_init_user_process(&thread->ctx, &thread->uctx,
&cpu_local_var(current)->uctx, ((char *)thread) +
((char *)cpu_local_var(current)) +
KERNEL_STACK_NR_PAGES * PAGE_SIZE, desc->entry, 0); KERNEL_STACK_NR_PAGES * PAGE_SIZE, desc->entry, 0);
/* Create virtual memory ranges and update args/envs */ /* Create virtual memory ranges and update args/envs */
if (prepare_process_ranges_args_envs(cpu_local_var(current), desc, desc, if (prepare_process_ranges_args_envs(thread, desc, desc,
PTATTR_NO_EXECUTE | PTATTR_WRITABLE | PTATTR_FOR_USER, PTATTR_NO_EXECUTE | PTATTR_WRITABLE | PTATTR_FOR_USER,
argv_flat, argv_flat_len, envp_flat, envp_flat_len) != 0) { argv_flat, argv_flat_len, envp_flat, envp_flat_len) != 0) {
kprintf("execve(): PANIC: preparing ranges, args, envs, stack\n"); kprintf("execve(): PANIC: preparing ranges, args, envs, stack\n");
@ -2286,7 +2285,7 @@ SYSCALL_DECLARE(execve)
clear_fp_regs(thread); clear_fp_regs(thread);
#endif /* POSTK_DEBUG_TEMP_FIX_19 */ #endif /* POSTK_DEBUG_TEMP_FIX_19 */
error = ptrace_report_exec(cpu_local_var(current)); error = ptrace_report_exec(thread);
if(error) { if(error) {
kprintf("execve(): ERROR: ptrace_report_exec()\n"); kprintf("execve(): ERROR: ptrace_report_exec()\n");
} }
@ -2310,8 +2309,10 @@ end:
cpu_local_var(runq_irqstate) = cpu_local_var(runq_irqstate) =
ihk_mc_spinlock_lock(&(get_this_cpu_local_var()->runq_lock)); ihk_mc_spinlock_lock(&(get_this_cpu_local_var()->runq_lock));
ihk_mc_switch_context(NULL, &cpu_local_var(current)->ctx, ihk_mc_switch_context(NULL, &thread->ctx, thread);
cpu_local_var(current));
/* not reached */
return -EFAULT;
} }
return ret; return ret;
} }