diff options
| author |   mpi <mpi@openbsd.org> | 2020-02-28 17:03:05 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2020-02-28 17:03:05 +0000 |
| commit | 2969925a5ca789aab61bd93676f03c257866fea0 (patch) | |
| tree | 606e936ed47f5f06db9f84a2609e48adc8e7629d /sys/kern/kern_exit.c | |
| parent | Add a sanity check on obj_size to ensure the allocated object fits inside (diff) | |
| download | wireguard-openbsd-2969925a5ca789aab61bd93676f03c257866fea0.tar.xz wireguard-openbsd-2969925a5ca789aab61bd93676f03c257866fea0.zip | |
Revert previous, diff contains an obvious bug.
Diffstat (limited to 'sys/kern/kern_exit.c')
| -rw-r--r-- | sys/kern/kern_exit.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 2481aaaf5a0..147f2737544 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_exit.c,v 1.183 2020/02/12 14:41:23 mpi Exp $ */ +/* $OpenBSD: kern_exit.c,v 1.184 2020/02/28 17:03:05 mpi Exp $ */ /* $NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $ */ /* @@ -584,8 +584,7 @@ proc_finish_wait(struct proc *waiter, struct proc *p) * we need to give it back to the old parent. */ pr = p->p_p; - if (pr->ps_oppid != 0 && (pr->ps_oppid != pr->ps_pptr->ps_pid) && - (tr = prfind(tr->ps_oppid))) { + if (pr->ps_oppid && (tr = prfind(pr->ps_oppid))) { atomic_clearbits_int(&pr->ps_flags, PS_TRACED); pr->ps_oppid = 0; proc_reparent(pr, tr); |