svn commit: r277915 - head/sys/cddl/contrib/opensolaris/uts/common/dtrace

[Mark Johnston]

Author: markj
Date: Fri Jan 30 05:03:23 2015
New Revision: 277915
URL: https://svnweb.freebsd.org/changeset/base/277915

Log:
  Don't attempt to disable enabled fasttrap probes in an exiting process.
  There's no need to do so, and we can't hold an exiting process, so this
  race can result in panics.
  
  MFC after:	1 week

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c	Fri Jan 30 04:51:59 2015	(r277914)
+++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c	Fri Jan 30 05:03:23 2015	(r277915)
@@ -1296,8 +1296,13 @@ fasttrap_pid_disable(void *arg, dtrace_i
 	 */
 	if ((p = pfind(probe->ftp_pid)) != NULL) {
 #ifdef __FreeBSD__
-		_PHOLD(p);
-		PROC_UNLOCK(p);
+		if (p->p_flag & P_WEXIT) {
+			PROC_UNLOCK(p);
+			p = NULL;
+		} else {
+			_PHOLD(p);
+			PROC_UNLOCK(p);
+		}
 #endif
 	}