From owner-p4-projects@FreeBSD.ORG Wed Sep 12 06:46:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E35DF16A469; Wed, 12 Sep 2007 06:46:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B08D016A420 for ; Wed, 12 Sep 2007 06:46:04 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9DC5D13C461 for ; Wed, 12 Sep 2007 06:46:04 +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 l8C6k4sL074776 for ; Wed, 12 Sep 2007 06:46:04 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8C6k4mq074773 for perforce@freebsd.org; Wed, 12 Sep 2007 06:46:04 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Wed, 12 Sep 2007 06:46:04 GMT Message-Id: <200709120646.l8C6k4mq074773@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 126326 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2007 06:46:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=126326 Change 126326 by zhouzhouyi@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 ==== //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);