MFV r283513:

5930 fasttrap_pid_enable() panics when prfind() fails in forking process
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Author: Bryan Cantrill <bryan@joyent.com>

illumos/illumos-gate@9df7e4e12eb093557252d3bec029b5c382613e36

diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
index b44de1d78154c23329bdb4c4140e06936b30a7f2..df485670abdd3a183c60c11ce4dc1b3a27e44938 100644 (file)
--- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
@@ -29,7 +29,7 @@
  */
 
 /*
- * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2015, Joyent, Inc. All rights reserved.
  */
 
 #include <sys/atomic.h>
@@ -1190,11 +1190,21 @@ fasttrap_pid_enable(void *arg, dtrace_id_t id, void *parg)
                mutex_enter(&pidlock);
                p = prfind(probe->ftp_pid);
 
+               if (p == NULL) {
+                       /*
+                        * So it's not that the target process is being born,
+                        * it's that it isn't there at all (and we simply
+                        * happen to be forking).  Anyway, we know that the
+                        * target is definitely gone, so bail out.
+                        */
+                       mutex_exit(&pidlock);
+                       return (0);
+               }
+
                /*
                 * Confirm that curproc is indeed forking the process in which
                 * we're trying to enable probes.
                 */
-               ASSERT(p != NULL);
                ASSERT(p->p_parent == curproc);
                ASSERT(p->p_stat == SIDL);