From owner-p4-projects@FreeBSD.ORG  Thu Jul 19 05:34:24 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 323AB16A403; Thu, 19 Jul 2007 05:34:24 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DE9EB16A400
	for <perforce@FreeBSD.org>; Thu, 19 Jul 2007 05:34:23 +0000 (UTC)
	(envelope-from zhouzhouyi@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id CFF7413C442
	for <perforce@FreeBSD.org>; Thu, 19 Jul 2007 05:34:23 +0000 (UTC)
	(envelope-from zhouzhouyi@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6J5YNiY037150
	for <perforce@FreeBSD.org>; Thu, 19 Jul 2007 05:34:23 GMT
	(envelope-from zhouzhouyi@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6J5YN2v037147
	for perforce@freebsd.org; Thu, 19 Jul 2007 05:34:23 GMT
	(envelope-from zhouzhouyi@FreeBSD.org)
Date: Thu, 19 Jul 2007 05:34:23 GMT
Message-Id: <200707190534.l6J5YN2v037147@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zhouzhouyi@FreeBSD.org using -f
From: Zhouyi ZHOU <zhouzhouyi@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 123713 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Jul 2007 05:34:24 -0000

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

Change 123713 by zhouzhouyi@zhouzhouyi_mactest on 2007/07/19 05:34:04

	Test for Mandatory Access Control for rename operation

Affected files ...

.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/misc.sh#10 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/02.t#4 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/rename/00.t#1 add

Differences ...

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

@@ -62,8 +62,9 @@
 	touch ${tmp_file1}
 
 #set equal label to above files
-	label=`getfmac "."| sed 's/\(\.:\ \)\([a-z\,\/]*\)/\2/` 
-	label1=`echo ${label}|sed 's/\/[a-z:0-9\+]*/\/equal/g`
+#	label=`getfmac "."| sed 's/\(\.:\ \)\([a-z\,\/]*\)/\2/` 
+#	label1=`echo ${label}|sed 's/\/[a-z:0-9\+]*/\/equal/g`
+	label1="mls/equal,biba/equal"
 	setfmac ${label1} ${tmp_file} ${tmp_file1} /var/log/mactest
 
 	${mactest} $* 2>${tmp_file1} 1>>${tmp_file}

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/02.t#4 (text+ko) ====

@@ -9,7 +9,7 @@
 dir=`dirname $0`
 . ${dir}/../misc.sh
 
-echo "1..5"
+echo "1..7"
 
 n0=`namegen`
 n1=`namegen`
@@ -59,12 +59,19 @@
     echo -n "pid = -2 mac_test_check_vnode_stat:" > ${mactest_conf}
     echo "biba/high(low-high),mls/low(low-high) NULL biba/high,mls/10" >> ${mactest_conf}
     mactestexpect "setfmac:.traversing.${n1}:.Permission.denied" "" -m ${dvplabel} -f ${mactest_conf} system setfmac "mls/low" ${n1}
-    
+
+#relabel the vnode to mls/low
+    rm ${mactest_conf}
+    touch ${mactest_conf}
+    mactestexpect "" "" -m mls/10 -f ${mactest_conf} system setfmac "mls/low" ${n1}
+
+#BLP: ok read low
+    mactestexpect "" 0 -m mls/10 -f ${mactest_conf} open ${n1} O_RDONLY
+
+
     t=`sysctl security.mac.mls.enabled=0`
     echo "disabling mac/mls!"
 
-  
-#BLP: ok read low
 #cleanup:
 #   cd ..
     rm -fr ${n1}