summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr/src/uts/common/dtrace/fasttrap.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/usr/src/uts/common/dtrace/fasttrap.c b/usr/src/uts/common/dtrace/fasttrap.c
index fc3d87574a..2dc2620535 100644
--- a/usr/src/uts/common/dtrace/fasttrap.c
+++ b/usr/src/uts/common/dtrace/fasttrap.c
@@ -25,7 +25,7 @@
*/
/*
- * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2015, Joyent, Inc. All rights reserved.
*/
#include <sys/atomic.h>
@@ -928,6 +928,17 @@ 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.