diff options
| author |   kettenis <kettenis@openbsd.org> | 2012-09-08 14:52:00 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2012-09-08 14:52:00 +0000 |
| commit | 121cb9296653d77a6eefbffed970253e2d58e97c (patch) | |
| tree | 89235025d1c7723dda69ccc19ab968bb16d8ffc0 /sys/kern/kern_exit.c | |
| parent | remove unused header (diff) | |
| download | wireguard-openbsd-121cb9296653d77a6eefbffed970253e2d58e97c.tar.xz wireguard-openbsd-121cb9296653d77a6eefbffed970253e2d58e97c.zip | |
Plug a race where we're trying to kill a traced process while it is aleady
exiting. At that point ps_single may point to a proc that's already freed.
Since there is no point in killing a process that's already exiting, just
skip this step.
ok guenther@
Diffstat (limited to 'sys/kern/kern_exit.c')
| -rw-r--r-- | sys/kern/kern_exit.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index f5f1ad1debc..c3db9084ed0 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_exit.c,v 1.118 2012/08/02 03:18:48 guenther Exp $ */ +/* $OpenBSD: kern_exit.c,v 1.119 2012/09/08 14:52:00 kettenis Exp $ */ /* $NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $ */ /* @@ -280,10 +280,11 @@ exit1(struct proc *p, int rv, int flags) nqr = LIST_NEXT(qr, ps_sibling); proc_reparent(qr, initproc->p_p); /* - * Traced processes are killed - * since their existence means someone is screwing up. + * Traced processes are killed since their + * existence means someone is screwing up. */ - if (qr->ps_flags & PS_TRACED) { + if (qr->ps_flags & PS_TRACED && + !(qr->ps_flags & PS_EXITING)) { atomic_clearbits_int(&qr->ps_flags, PS_TRACED); /* * If single threading is active, |