6472091 fix for 6387493 breaks 'uid' and causes panics

5 files changed, 200 insertions, 0 deletions

diff --git a/usr/src/cmd/dtrace/test/pkg/SUNWdtrt/prototype_com b/usr/src/cmd/dtrace/test/pkg/SUNWdtrt/prototype_com
index 93b1b75ea9..a320f3b579 100644
--- a/usr/src/cmd/dtrace/test/pkg/SUNWdtrt/prototype_com
+++ b/usr/src/cmd/dtrace/test/pkg/SUNWdtrt/prototype_com
@@ -948,10 +948,13 @@ f none opt/SUNWdtrt/tst/common/safety/tst.cleanpath.d 0444 root bin
 f none opt/SUNWdtrt/tst/common/safety/tst.copyin.d 0444 root bin
 f none opt/SUNWdtrt/tst/common/safety/tst.ddi_pathname.d 0444 root bin
 f none opt/SUNWdtrt/tst/common/safety/tst.dirname.d 0444 root bin
+f none opt/SUNWdtrt/tst/common/safety/tst.errno.d 0444 root bin
+f none opt/SUNWdtrt/tst/common/safety/tst.gid.d 0444 root bin
 f none opt/SUNWdtrt/tst/common/safety/tst.index.d 0444 root bin
 f none opt/SUNWdtrt/tst/common/safety/tst.msgdsize.d 0444 root bin
 f none opt/SUNWdtrt/tst/common/safety/tst.msgsize.d 0444 root bin
 f none opt/SUNWdtrt/tst/common/safety/tst.null.d 0444 root bin
+f none opt/SUNWdtrt/tst/common/safety/tst.ppid.d 0444 root bin
 f none opt/SUNWdtrt/tst/common/safety/tst.progenyof.d 0444 root bin
 f none opt/SUNWdtrt/tst/common/safety/tst.random.d 0444 root bin
 f none opt/SUNWdtrt/tst/common/safety/tst.rw.d 0444 root bin
@@ -963,6 +966,7 @@ f none opt/SUNWdtrt/tst/common/safety/tst.strjoin.d 0444 root bin
 f none opt/SUNWdtrt/tst/common/safety/tst.strstr.d 0444 root bin
 f none opt/SUNWdtrt/tst/common/safety/tst.strtok.d 0444 root bin
 f none opt/SUNWdtrt/tst/common/safety/tst.substr.d 0444 root bin
+f none opt/SUNWdtrt/tst/common/safety/tst.uid.d 0444 root bin
 f none opt/SUNWdtrt/tst/common/safety/tst.unalign.d 0444 root bin
 f none opt/SUNWdtrt/tst/common/safety/tst.uregs.d 0444 root bin
 f none opt/SUNWdtrt/tst/common/safety/tst.ustack.d 0444 root bin
diff --git a/usr/src/cmd/dtrace/test/tst/common/safety/tst.errno.d b/usr/src/cmd/dtrace/test/tst/common/safety/tst.errno.d
new file mode 100644
index 0000000000..d3f238b79e
--- /dev/null
+++ b/usr/src/cmd/dtrace/test/tst/common/safety/tst.errno.d
@@ -0,0 +1,49 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+/*
+ * ASSERTION:
+ * 	collect errno at every fbt probe and at every firing of a
+ *	high-frequency profile probe
+ */
+
+fbt:::
+{
+	@a[errno] = count();
+}
+
+profile-4999hz
+{
+	@a[errno] = count();
+}
+
+tick-1sec
+/n++ == 10/
+{
+	exit(0);
+}
diff --git a/usr/src/cmd/dtrace/test/tst/common/safety/tst.gid.d b/usr/src/cmd/dtrace/test/tst/common/safety/tst.gid.d
new file mode 100644
index 0000000000..f8f90e7364
--- /dev/null
+++ b/usr/src/cmd/dtrace/test/tst/common/safety/tst.gid.d
@@ -0,0 +1,49 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+/*
+ * ASSERTION:
+ * 	collect gid at every fbt probe and at every firing of a
+ *	high-frequency profile probe
+ */
+
+fbt:::
+{
+	@a[gid] = count();
+}
+
+profile-4999hz
+{
+	@a[gid] = count();
+}
+
+tick-1sec
+/n++ == 10/
+{
+	exit(0);
+}
diff --git a/usr/src/cmd/dtrace/test/tst/common/safety/tst.ppid.d b/usr/src/cmd/dtrace/test/tst/common/safety/tst.ppid.d
new file mode 100644
index 0000000000..faf07dc482
--- /dev/null
+++ b/usr/src/cmd/dtrace/test/tst/common/safety/tst.ppid.d
@@ -0,0 +1,49 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+/*
+ * ASSERTION:
+ * 	collect ppid at every fbt probe and at every firing of a
+ *	high-frequency profile probe
+ */
+
+fbt:::
+{
+	@a[ppid] = count();
+}
+
+profile-4999hz
+{
+	@a[ppid] = count();
+}
+
+tick-1sec
+/n++ == 10/
+{
+	exit(0);
+}
diff --git a/usr/src/cmd/dtrace/test/tst/common/safety/tst.uid.d b/usr/src/cmd/dtrace/test/tst/common/safety/tst.uid.d
new file mode 100644
index 0000000000..b546457e78
--- /dev/null
+++ b/usr/src/cmd/dtrace/test/tst/common/safety/tst.uid.d
@@ -0,0 +1,49 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+/*
+ * ASSERTION:
+ * 	collect uid at every fbt probe and at every firing of a
+ *	high-frequency profile probe
+ */
+
+fbt:::
+{
+	@a[uid] = count();
+}
+
+profile-4999hz
+{
+	@a[uid] = count();
+}
+
+tick-1sec
+/n++ == 10/
+{
+	exit(0);
+}