diff options
| author | Philip Guenthe <guenther@cvs.openbsd.org> | 2011-04-03 14:56:29 +0000 |
|---|---|---|
| committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2011-04-03 14:56:29 +0000 |
| commit | 445a93dfa951cfdb8d9253fd13836d6a25a4ac4b (patch) | |
| tree | 9248ed7a9eb63023a13f069c04bd049ee460f416 /sys/arch/sh | |
| parent | e3f9e42db6dd7e48f8bd5a3da7d5b2bb44f3752f (diff) | |
Move PPWAIT flag from struct proc to process, so that rthreads in
a vforked child behave correctly. Have the parent in a vfork()
wait on a (different) flag in *its* process instead of the child
to prevent a possible use-after-free. When ktracing the child
return from a fork, call it rfork if an rthread was created.
ok blambert@
Diffstat (limited to 'sys/arch/sh')
| -rw-r--r-- | sys/arch/sh/sh/trap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/sh/sh/trap.c b/sys/arch/sh/sh/trap.c index 85895c337bf..74ec6a38315 100644 --- a/sys/arch/sh/sh/trap.c +++ b/sys/arch/sh/sh/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.16 2010/06/27 12:41:23 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.17 2011/04/03 14:56:28 guenther Exp $ */ /* $NetBSD: exception.c,v 1.32 2006/09/04 23:57:52 uwe Exp $ */ /* $NetBSD: syscall.c,v 1.6 2006/03/07 07:21:50 thorpej Exp $ */ @@ -693,7 +693,9 @@ child_return(void *arg) #ifdef KTRACE if (KTRPOINT(p, KTR_SYSRET)) ktrsysret(p, - (p->p_flag & P_PPWAIT) ? SYS_vfork : SYS_fork, 0, 0); + (p->p_flag & P_THREAD) ? SYS_rfork : + (p->p_p->ps_flags & PS_PPWAIT) ? SYS_vfork : SYS_fork, + 0, 0); #endif } |