4970596 RFE: should be able to run some DTrace programs in a zone

6231905 PRIV_DTRACE_PROC and PRIV_DTRACE_USER don't respect PRIV_PROC_ZONE
6388070 non-root non-global zone users can't get dtrace provider modules to load
6393431 dtrace_proc + proc_owner doesn't sufficiently enable destructive actions

3 files changed, 13 insertions, 11 deletions

diff --git a/usr/src/uts/intel/dtrace/fbt.c b/usr/src/uts/intel/dtrace/fbt.c
index 3009dc6d88..40d5dbdab6 100644
--- a/usr/src/uts/intel/dtrace/fbt.c
+++ b/usr/src/uts/intel/dtrace/fbt.c
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * 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.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -719,7 +718,7 @@ fbt_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 
 	if (ddi_create_minor_node(devi, "fbt", S_IFCHR, 0,
 	    DDI_PSEUDO, NULL) == DDI_FAILURE ||
-	    dtrace_register("fbt", &fbt_attr, DTRACE_PRIV_KERNEL, 0,
+	    dtrace_register("fbt", &fbt_attr, DTRACE_PRIV_KERNEL, NULL,
 	    &fbt_pops, NULL, &fbt_id) != 0) {
 		fbt_cleanup(devi);
 		return (DDI_FAILURE);
diff --git a/usr/src/uts/intel/dtrace/sdt.c b/usr/src/uts/intel/dtrace/sdt.c
index 68c2094cbb..aa31d84d14 100644
--- a/usr/src/uts/intel/dtrace/sdt.c
+++ b/usr/src/uts/intel/dtrace/sdt.c
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * 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.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -329,7 +328,7 @@ sdt_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 
 	for (prov = sdt_providers; prov->sdtp_name != NULL; prov++) {
 		if (dtrace_register(prov->sdtp_name, prov->sdtp_attr,
-		    DTRACE_PRIV_KERNEL, 0,
+		    DTRACE_PRIV_KERNEL, NULL,
 		    &sdt_pops, prov, &prov->sdtp_id) != 0) {
 			cmn_err(CE_WARN, "failed to register sdt provider %s",
 			    prov->sdtp_name);
diff --git a/usr/src/uts/intel/os/minor_perm b/usr/src/uts/intel/os/minor_perm
index 6a591a9f6c..2bff059569 100644
--- a/usr/src/uts/intel/os/minor_perm
+++ b/usr/src/uts/intel/os/minor_perm
@@ -42,12 +42,13 @@ devinfo:devinfo,ro 0444 root sys
 dtrace:* 0666 root sys
 dump:dump 0660 root sys
 fasttrap:fasttrap 0666 root sys
+fbt:fbt 0644 root sys
 fd:* 0666 root sys
 id:* 0640 root sys
 kstat:* 0666 root sys
 ksyms:* 0666 root sys
 lo:* 0666 root sys
-lockstat:* 0600 root sys
+lockstat:* 0644 root sys
 lofi:* 0600 root sys
 lofi:ctl 0644 root sys
 log:conslog 0666 root sys
@@ -60,6 +61,7 @@ mm:null 0666 root sys
 mm:zero 0666 root sys
 msm:l 0666 root sys
 openeepr:openprom 0640 root sys
+profile:profile 0644 root sys
 ptc:* 0666 root sys
 pts:* 0644 root sys
 pts:0 0620 root tty
@@ -73,9 +75,11 @@ sgen:* 0600 root sys
 cmdk:* 0640 root sys
 st:* 0666 root sys
 sbpro:* 0600 root sys
+sdt:sdt 0644 root sys
 sy:tty 0666 root tty
 sysmsg:msglog 0600 root sys
 sysmsg:sysmsg 0600 root sys
+systrace:systrace 0644 root sys
 winlock:* 0666 root sys
 asy:[a-z] 0666 root sys
 asy:[a-z],cu 0600 uucp uucp