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

terminate: fix to reference freed pointer

Browse Source
This commit is contained in:
Tomoki Shirasawa
2017-07-17 19:32:08 +09:00
parent 035e7913d8
commit bd75e80df2
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/syscall.c
View File

@@ -895,13 +895,14 @@ terminate(int rc, int sig)
list_for_each_entry_safe(child, next, list_for_each_entry_safe(child, next,
&resource_set->process_hash->list[i], &resource_set->process_hash->list[i],
hash_list){ hash_list){
int free_child = 0;
mcs_rwlock_writer_lock_noirq(&child->update_lock, mcs_rwlock_writer_lock_noirq(&child->update_lock,
&updatelock); &updatelock);
if(child->ppid_parent == proc && if(child->ppid_parent == proc &&
child->status == PS_ZOMBIE){ child->status == PS_ZOMBIE){
list_del(&child->hash_list); list_del(&child->hash_list);
list_del(&child->siblings_list); list_del(&child->siblings_list);
kfree(child); free_child = 1;
} }
else if(child->ppid_parent == proc){ else if(child->ppid_parent == proc){
mcs_rwlock_writer_lock_noirq(&proc->children_lock, mcs_rwlock_writer_lock_noirq(&proc->children_lock,
@@ -927,6 +928,8 @@ terminate(int rc, int sig)
} }
mcs_rwlock_writer_unlock_noirq(&child->update_lock, mcs_rwlock_writer_unlock_noirq(&child->update_lock,
&updatelock); &updatelock);
if (free_child)
kfree(child);
} }
mcs_rwlock_writer_unlock(&resource_set->process_hash->lock[i], mcs_rwlock_writer_unlock(&resource_set->process_hash->lock[i],
&lock); &lock);