Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7-0]: src/sys/kern Pull up following revision(s) (requested by pg...
details: https://anonhg.NetBSD.org/src/rev/2abc7908b936
branches: netbsd-7-0
changeset: 801060:2abc7908b936
user: snj <snj%NetBSD.org@localhost>
date: Thu Nov 05 09:21:50 2015 +0000
description:
Pull up following revision(s) (requested by pgoyette in ticket #997):
sys/kern/kern_sig.c: revision 1.321
When delivering a signal, it's possible that the process's state in
p_stat is SACTIVE yet p_sflag is PS_STOPPING (while waiting for other
lwp's to stop). In that case, we don't want to adjust the parent's
p_nstopchild count.
Found by Robert Elz.
diffstat:
sys/kern/kern_sig.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diffs (37 lines):
diff -r e731ba3bf89e -r 2abc7908b936 sys/kern/kern_sig.c
--- a/sys/kern/kern_sig.c Thu Nov 05 09:05:18 2015 +0000
+++ b/sys/kern/kern_sig.c Thu Nov 05 09:21:50 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.319 2013/11/22 21:04:11 christos Exp $ */
+/* $NetBSD: kern_sig.c,v 1.319.8.1 2015/11/05 09:21:50 snj Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.319 2013/11/22 21:04:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.319.8.1 2015/11/05 09:21:50 snj Exp $");
#include "opt_ptrace.h"
#include "opt_compat_sunos.h"
@@ -1364,14 +1364,13 @@
}
if ((prop & SA_CONT) != 0 || signo == SIGKILL) {
/*
- * Re-adjust p_nstopchild if the process wasn't
- * collected by its parent.
+ * Re-adjust p_nstopchild if the process was
+ * stopped but not yet collected by its parent.
*/
+ if (p->p_stat == SSTOP && !p->p_waited)
+ p->p_pptr->p_nstopchild--;
p->p_stat = SACTIVE;
p->p_sflag &= ~PS_STOPPING;
- if (!p->p_waited) {
- p->p_pptr->p_nstopchild--;
- }
if (p->p_slflag & PSL_TRACED) {
KASSERT(signo == SIGKILL);
goto deliver;
Home |
Main Index |
Thread Index |
Old Index