From owner-svn-src-stable@FreeBSD.ORG  Wed Feb 18 08:10:14 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 80B61AB3;
 Wed, 18 Feb 2015 08:10:14 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6B036F96;
 Wed, 18 Feb 2015 08:10:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1I8AEVi025587;
 Wed, 18 Feb 2015 08:10:14 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1I8AEeY025586;
 Wed, 18 Feb 2015 08:10:14 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201502180810.t1I8AEeY025586@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 18 Feb 2015 08:10:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r278949 - stable/10/sys/kern
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Feb 2015 08:10:14 -0000

Author: kib
Date: Wed Feb 18 08:10:13 2015
New Revision: 278949
URL: https://svnweb.freebsd.org/changeset/base/278949

Log:
  MFC r278795:
  Reparenting done by debugger attach can leave reaper without direct
  children.  Handle the situation instead asserting that it is
  impossible.

Modified:
  stable/10/sys/kern/kern_procctl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/kern_procctl.c
==============================================================================
--- stable/10/sys/kern/kern_procctl.c	Wed Feb 18 08:08:09 2015	(r278948)
+++ stable/10/sys/kern/kern_procctl.c	Wed Feb 18 08:10:13 2015	(r278949)
@@ -160,7 +160,7 @@ static int
 reap_status(struct thread *td, struct proc *p,
     struct procctl_reaper_status *rs)
 {
-	struct proc *reap, *p2;
+	struct proc *reap, *p2, *first_p;
 
 	sx_assert(&proctree_lock, SX_LOCKED);
 	bzero(rs, sizeof(*rs));
@@ -176,8 +176,10 @@ reap_status(struct thread *td, struct pr
 	rs->rs_descendants = 0;
 	rs->rs_children = 0;
 	if (!LIST_EMPTY(&reap->p_reaplist)) {
-		KASSERT(!LIST_EMPTY(&reap->p_children), ("no children"));
-		rs->rs_pid = LIST_FIRST(&reap->p_children)->p_pid;
+		first_p = LIST_FIRST(&reap->p_children);
+		if (first_p == NULL)
+			first_p = LIST_FIRST(&reap->p_reaplist);
+		rs->rs_pid = first_p->p_pid;
 		LIST_FOREACH(p2, &reap->p_reaplist, p_reapsibling) {
 			if (proc_realparent(p2) == reap)
 				rs->rs_children++;