PERFORCE change 126326 for review

[Zhouyi ZHOU]

http://perforce.freebsd.org/chv.cgi?CH=126326

Change 126326 by zhouzhouyi at zhouzhouyi_mactest on 2007/09/12 06:45:41

	Add Mandatory Access Control Hooks for ptrace

Affected files ...

.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/Makefile#12 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/macproc.c#2 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/ptrace.c#1 add
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/debug/00.t#1 add
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/misc.sh#22 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#3 edit

Differences ...

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/Makefile#12 (text+ko) ====

@@ -7,7 +7,7 @@
 #CFLAGS+=-DHAS_STAT64
 
 all:	macproc mactest mdconfigopenrdonly fifo_io pipe_io macping shmtest \
-	semtest msgtest mmaptest tcpconnect
+	semtest msgtest mmaptest tcpconnect ptrace
 
 macproc:	macproc.c
 	gcc -Wall ${CFLAGS} macproc.c -o macproc -lutil
@@ -31,9 +31,10 @@
 	gcc ${CFLAGS} -o msgtest msgtest.c macconf.c mactestparser.tab.c
 mmaptest: mmaptest.c macconf.c mactestparser.tab.c
 	gcc ${CFLAGS} -o mmaptest mmaptest.c macconf.c mactestparser.tab.c
-tcpconnect: tcpconnect.c 
+tcpconnect: tcpconnect.c macconf.c mactestparser.tab.c
 	gcc ${CFLAGS} -o tcpconnect tcpconnect.c macconf.c mactestparser.tab.c -lpcap
-
+ptrace: ptrace.c macconf.c mactestparser.tab.c
+	gcc ${CFLAGS} -o ptrace ptrace.c macconf.c mactestparser.tab.c
 
 clean:
 	rm -f macproc
@@ -46,4 +47,5 @@
 	rm -f semtest
 	rm -f msgtest
 	rm -f mmaptest
-	rm -f tcpconnect+	rm -f tcpconnect
+	rm -f ptrace
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/macproc.c#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/tools/regression/mactest/mactest.c,v 1.1 2007/05/17 01:42:07 zhouzhouyi Exp $
+ * $FreeBSD: src/tools/regression/mactest/macproc.c,v 1.1 2007/05/17 01:42:07 zhouzhouyi Exp $
  */
 
 #include <sys/param.h>

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/misc.sh#22 (text+ko) ====

@@ -26,6 +26,7 @@
 msgtest="${maindir}/msgtest"
 mmaptest="${maindir}/mmaptest"
 tcpconnect="${maindir}/tcpconnect"
+ptrace="${maindir}/ptrace"
 
 . ${maindir}/tests/conf
 

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#3 (text+ko) ====

@@ -2186,8 +2186,8 @@
 	MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_check_proc_debug "
 		"with cr_label:",
 		strlen("mac_test_check_proc_debug "
-			"with cr_label:"));
-	MAC_TEST_LOG_SUBMIT_LABEL(cred, cred->cr_label);
+			"with cr_label and proc label:"));
+	MAC_TEST_LOG_SUBMIT_LABEL2(cred, cred->cr_label, cred, p->p_ucred->cr_label);
 	LABEL_CHECK(cred->cr_label, MAGIC_CRED);
 	LABEL_CHECK(p->p_ucred->cr_label, MAGIC_CRED);
 	COUNTER_INC(check_proc_debug);