d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFp4 (part of 114132):

Browse Source 
- Fix a LOR caused by holding emul_lock and proctree_lock at once.

Submitted by:	rdivacky
This commit is contained in:
Alexander Leidinger 2007-02-23 22:29:24 +00:00
parent af4394d40a
commit e8b8b834b4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=166930
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/compat/linux/linux_emul.c
View File

@ -168,19 +168,20 @@ linux_proc_exit(void *arg __unused, struct proc *p)
/* reparent all procs that are not a thread leader to initproc */
if (em->shared->group_pid != p->p_pid) {
sx_xlock(&proctree_lock);
wakeup(initproc);
child_clear_tid = em->child_clear_tid;
EMUL_UNLOCK(&emul_lock);
sx_xlock(&proctree_lock);
wakeup(initproc);
PROC_LOCK(p);
proc_reparent(p, initproc);
p->p_sigparent = SIGCHLD;
PROC_UNLOCK(p);
sx_xunlock(&proctree_lock);
sx_xunlock(&proctree_lock);
} else {
child_clear_tid = em->child_clear_tid;
EMUL_UNLOCK(&emul_lock);
}
child_clear_tid = em->child_clear_tid;
EMUL_UNLOCK(&emul_lock);
EMUL_SHARED_WLOCK(&emul_shared_lock);
LIST_REMOVE(em, threads);