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

[Konstantin Belousov]

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

Log:
  MFC r278794:
  Return with the process locked.

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:06:36 2015	(r278947)
+++ stable/10/sys/kern/kern_procctl.c	Wed Feb 18 08:08:09 2015	(r278948)
@@ -239,13 +239,13 @@ reap_kill(struct thread *td, struct proc
 	int error, error1;
 
 	sx_assert(&proctree_lock, SX_LOCKED);
-	PROC_UNLOCK(p);
 	if (IN_CAPABILITY_MODE(td))
 		return (ECAPMODE);
 	if (rk->rk_sig <= 0 || rk->rk_sig > _SIG_MAXSIG)
 		return (EINVAL);
 	if ((rk->rk_flags & ~REAPER_KILL_CHILDREN) != 0)
 		return (EINVAL);
+	PROC_UNLOCK(p);
 	reap = (p->p_treeflag & P_TREE_REAPER) == 0 ? p->p_reaper : p;
 	ksiginfo_init(&ksi);
 	ksi.ksi_signo = rk->rk_sig;