diff options
| author |   guenther <guenther@openbsd.org> | 2011-04-03 14:56:27 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2011-04-03 14:56:27 +0000 |
| commit | c0ce47d96f277436fbde5279039dad42b016a9b2 (patch) | |
| tree | ba57ac46912617f1c7dd53acb3befb855db19709 /sys/kern/kern_sig.c | |
| parent | No need to include uvm/uvm_extern.h and fix a typo. (diff) | |
| download | wireguard-openbsd-c0ce47d96f277436fbde5279039dad42b016a9b2.tar.xz wireguard-openbsd-c0ce47d96f277436fbde5279039dad42b016a9b2.zip | |
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/kern/kern_sig.c')
| -rw-r--r-- | sys/kern/kern_sig.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 39bf31572e7..6e1c1ead1e9 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sig.c,v 1.118 2011/04/02 17:04:35 guenther Exp $ */ +/* $OpenBSD: kern_sig.c,v 1.119 2011/04/03 14:56:28 guenther Exp $ */ /* $NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $ */ /* @@ -938,7 +938,7 @@ ptsignal(struct proc *p, int signum, enum signal_type type) * If a child holding parent blocked, * stopping could cause deadlock. */ - if (p->p_flag & P_PPWAIT) + if (p->p_p->ps_flags & PS_PPWAIT) goto out; atomic_clearbits_int(&p->p_siglist, mask); p->p_xstat = signum; @@ -1056,7 +1056,7 @@ issignal(struct proc *p) for (;;) { mask = p->p_siglist & ~p->p_sigmask; - if (p->p_flag & P_PPWAIT) + if (p->p_p->ps_flags & PS_PPWAIT) mask &= ~stopsigmask; if (mask == 0) /* no signal to send */ return (0); @@ -1071,7 +1071,8 @@ issignal(struct proc *p) if (mask & p->p_sigignore && (p->p_flag & P_TRACED) == 0) continue; - if (p->p_flag & P_TRACED && (p->p_flag & P_PPWAIT) == 0) { + if (p->p_flag & P_TRACED && + (p->p_p->ps_flags & PS_PPWAIT) == 0) { /* * If traced, always stop, and stay * stopped until released by the debugger. |