svn commit: r278949 - stable/10/sys/kern

[Konstantin Belousov]

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++;