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

Fix thread status race-condition caused by hold_thread() in do_kill() and terminate()

Browse Source 
Conflicts:
	arch/x86_64/kernel/syscall.c
	kernel/syscall.c
This commit is contained in:
Masamichi Takagi
2018-01-26 22:00:24 +09:00
parent 51bc5fd61f
commit 65667709a8
4 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/syscall.c
View File

@ -1004,13 +1004,13 @@ void terminate(int rc, int sig)
sync_child_event(proc->monitoring_event);
// clean up threads
mcs_rwlock_reader_lock(&proc->threads_lock, &lock); // conflict clone
mcs_rwlock_writer_lock(&proc->threads_lock, &lock); // conflict clone
mcs_rwlock_writer_lock_noirq(&proc->update_lock, &updatelock);
if (proc->status == PS_EXITED) {
mcs_rwlock_writer_unlock_noirq(&proc->update_lock, &updatelock);
mcs_rwlock_reader_unlock(&proc->threads_lock, &lock);
preempt_disable();
mythread->status = PS_EXITED;
mcs_rwlock_writer_unlock_noirq(&proc->update_lock, &updatelock);
mcs_rwlock_writer_unlock(&proc->threads_lock, &lock);
release_thread(mythread);
preempt_enable();
schedule();
@ -1021,10 +1021,10 @@ void terminate(int rc, int sig)
exit_status = ((rc & 0x00ff) << 8) | (sig & 0xff);
mythread->exit_status = exit_status;
proc->status = PS_EXITED;
terminate_mcexec(rc, sig);
mcs_rwlock_writer_unlock_noirq(&proc->update_lock, &updatelock);
mcs_rwlock_reader_unlock(&proc->threads_lock, &lock);
mcs_rwlock_writer_unlock(&proc->threads_lock, &lock);
terminate_mcexec(rc, sig);
mcs_rwlock_writer_lock(&proc->threads_lock, &lock);
list_del(&mythread->siblings_list);
@ -1174,7 +1174,9 @@ void terminate(int rc, int sig)
finalize_process(proc);
preempt_disable();
mcs_rwlock_writer_lock(&proc->threads_lock, &lock);
mythread->status = PS_EXITED;
mcs_rwlock_writer_unlock(&proc->threads_lock, &lock);
release_thread(mythread);
release_process_vm(vm);
preempt_enable();
@ -5475,16 +5477,16 @@ do_exit(int code)
FUTEX_WAKE, 1, 0, NULL, 0, 0, 1);
}
mcs_rwlock_reader_lock(&proc->threads_lock, &lock);
mcs_rwlock_writer_lock(&proc->threads_lock, &lock);
if(proc->status == PS_EXITED){
mcs_rwlock_reader_unlock(&proc->threads_lock, &lock);
mcs_rwlock_writer_unlock(&proc->threads_lock, &lock);
terminate(exit_status, 0);
return;
}
preempt_disable();
thread->status = PS_EXITED;
sync_child_event(thread->proc->monitoring_event);
mcs_rwlock_reader_unlock(&proc->threads_lock, &lock);
mcs_rwlock_writer_unlock(&proc->threads_lock, &lock);
release_thread(thread);
preempt_enable();