Sat Nov 7 20:45:20 2015 UTC ()

Pull up following revision(s) (requested by pgoyette in ticket #1980):
	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.


(snj)

diff -r1.289.4.8 -r1.289.4.9 src/sys/kern/kern_sig.c

--- src/sys/kern/kern_sig.c 2012/03/17 19:14:08	1.289.4.8
+++ src/sys/kern/kern_sig.c 2015/11/07 20:45:19	1.289.4.9

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_sig.c,v 1.289.4.8 2012/03/17 19:14:08 bouyer Exp $	*/
+/*	$NetBSD: kern_sig.c,v 1.289.4.9 2015/11/07 20:45:19 snj Exp $	*/
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -56,27 +56,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_sig.c	8.14 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.289.4.8 2012/03/17 19:14:08 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.289.4.9 2015/11/07 20:45:19 snj Exp $");
 #include "opt_ptrace.h"
 #include "opt_compat_sunos.h"
 #include "opt_compat_netbsd.h"
 #include "opt_compat_netbsd32.h"
 #include "opt_pax.h"
 #include "opt_sa.h"
 #define	SIGPROP		/* include signal properties table */
 #include <sys/param.h>
 #include <sys/signalvar.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 @@ -1392,34 +1392,33 @@ kpsignal2(struct proc *p, ksiginfo_t *ks
 		if ((prop & SA_CONT) != 0 && action == SIG_DFL)
 			goto out;
 	} else {
 		/*
 		 * Process is stopped or stopping.
 		 * - If traced, then no action is needed, unless killing.
 		 * - Run the process only if sending SIGCONT or SIGKILL.
 		 */
 		if ((p->p_slflag & PSL_TRACED) != 0 && signo != SIGKILL) {
 			goto out;
+		}
 		if ((prop & SA_CONT) != 0 || signo == SIGKILL) {
 			/*
-			 * Re-adjust p_nstopchild if the process wasn't
+			 * Re-adjust p_nstopchild if the process was
-			 * collected by its parent.
+			 * 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;
+			}
 			/*
 			 * Do not make signal pending if SIGCONT is default.
+			 *
 			 * If the process catches SIGCONT, let it handle the
 			 * signal itself (if waiting on event - process runs,
 			 * otherwise continues sleeping).
 			 */
 			if ((prop & SA_CONT) != 0 && action == SIG_DFL) {
 				KASSERT(signo != SIGKILL);