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

- Proper locking for p_tracep and p_traceflag.

Browse Source 
- Catch up to new ktrace API.
This commit is contained in:
John Baldwin 2002-06-07 05:42:25 +00:00
parent 6c84de02e0
commit af300f2367
1 changed files with 7 additions and 7 deletions

14
sys/kern/kern_fork.c

@ -597,15 +597,16 @@ again:
#ifdef KTRACE #ifdef KTRACE
/* /*
* Copy traceflag and tracefile if enabled. If not inherited, * Copy traceflag and tracefile if enabled.
* these were zeroed above but we still could have a trace race
* so make sure p2's p_tracep is NULL.
*/ */
if ((p1->p_traceflag & KTRFAC_INHERIT) && p2->p_tracep == NULL) { mtx_lock(&ktrace_mtx);
KASSERT(p2->p_tracep == NULL, ("new process has a ktrace vnode"));
if (p1->p_traceflag & KTRFAC_INHERIT) {
p2->p_traceflag = p1->p_traceflag; p2->p_traceflag = p1->p_traceflag;
if ((p2->p_tracep = p1->p_tracep) != NULL) if ((p2->p_tracep = p1->p_tracep) != NULL)
VREF(p2->p_tracep); VREF(p2->p_tracep);
} }
mtx_unlock(&ktrace_mtx);
#endif #endif
/* /*
@ -861,9 +862,8 @@ fork_return(td, frame)
userret(td, frame, 0); userret(td, frame, 0);
#ifdef KTRACE #ifdef KTRACE
if (KTRPOINT(td->td_proc, KTR_SYSRET)) { if (KTRPOINT(td, KTR_SYSRET))
ktrsysret(td->td_proc->p_tracep, SYS_fork, 0, 0); ktrsysret(SYS_fork, 0, 0);
}
#endif #endif
mtx_assert(&Giant, MA_NOTOWNED); mtx_assert(&Giant, MA_NOTOWNED);
} }