diff options
| author |   guenther <guenther@openbsd.org> | 2013-06-03 22:35:15 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2013-06-03 22:35:15 +0000 |
| commit | f99e27febca7df3237f9344d97b5558dae3361ab (patch) | |
| tree | 1f81ef251995a8b16c885ffef6365a38a89c3b09 | |
| parent | Define some more DCSR/DCTL bits; ok kettenis (diff) | |
| download | wireguard-openbsd-f99e27febca7df3237f9344d97b5558dae3361ab.tar.xz wireguard-openbsd-f99e27febca7df3237f9344d97b5558dae3361ab.zip | |
When creating a thread, don't add it to the process's thread list
until it's fully built, so that it can't get a signal from
realitexpire(), as seen by sthen@ and espie@ in ports builds.
Exact bits moved down worked out with tedu@, ok deraadt@
| -rw-r--r-- | sys/kern/kern_fork.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 5d3ee5312c6..378b367efe5 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_fork.c,v 1.148 2013/06/03 16:55:22 guenther Exp $ */ +/* $OpenBSD: kern_fork.c,v 1.149 2013/06/03 22:35:15 guenther Exp $ */ /* $NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $ */ /* @@ -323,16 +323,7 @@ fork1(struct proc *curp, int exitsig, int flags, void *stack, pid_t *tidptr, if (flags & FORK_THREAD) { atomic_setbits_int(&p->p_flag, P_THREAD); p->p_p = pr = curpr; - TAILQ_INSERT_TAIL(&pr->ps_threads, p, p_thr_link); pr->ps_refcnt++; - /* - * if somebody else wants to take us to single threaded mode, - * count ourselves in. - */ - if (pr->ps_single) { - curpr->ps_singlecount++; - atomic_setbits_int(&p->p_flag, P_SUSPSINGLE); - } } else { process_new(p, curpr); pr = p->p_p; @@ -474,6 +465,16 @@ fork1(struct proc *curp, int exitsig, int flags, void *stack, pid_t *tidptr, pr->ps_ptstat->pe_other_pid = curpr->ps_pid; } } + } else { + TAILQ_INSERT_TAIL(&pr->ps_threads, p, p_thr_link); + /* + * if somebody else wants to take us to single threaded mode, + * count ourselves in. + */ + if (pr->ps_single) { + curpr->ps_singlecount++; + atomic_setbits_int(&p->p_flag, P_SUSPSINGLE); + } } #if NSYSTRACE > 0 |