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

Some callers of proc_reparent() already have the parent process locked.

Browse Source 
Detect the situation and avoid process lock recursion.

Reported by:	Fabian Keil <freebsd-listen fabiankeil de>
This commit is contained in:
Konstantin Belousov 2011-04-10 17:07:02 +00:00
parent a827fe1fdf
commit 2cfd5d3c91
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/kern_exit.c
View File

@ -903,15 +903,19 @@ kern_wait(struct thread *td, pid_t pid, int *status, int options,
void
proc_reparent(struct proc *child, struct proc *parent)
{
int locked;
sx_assert(&proctree_lock, SX_XLOCKED);
PROC_LOCK_ASSERT(child, MA_OWNED);
if (child->p_pptr == parent)
return;
PROC_LOCK(parent);
locked = PROC_LOCKED(parent);
if (!locked)
PROC_LOCK(parent);
racct_add_force(parent, RACCT_NPROC, 1);
PROC_UNLOCK(parent);
if (!locked)
PROC_UNLOCK(parent);
PROC_LOCK(child->p_pptr);
racct_sub(child->p_pptr, RACCT_NPROC, 1);
sigqueue_take(child->p_ksi);