From owner-p4-projects@FreeBSD.ORG  Wed Dec 10 08:50:54 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7FA5316A4D0; Wed, 10 Dec 2003 08:50:54 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 563C516A4CE
	for <perforce@freebsd.org>; Wed, 10 Dec 2003 08:50:54 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3216A43D2B
	for <perforce@freebsd.org>; Wed, 10 Dec 2003 08:50:52 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBAGopXJ016550
	for <perforce@freebsd.org>; Wed, 10 Dec 2003 08:50:51 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBAGoofx016547
	for perforce@freebsd.org; Wed, 10 Dec 2003 08:50:50 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Date: Wed, 10 Dec 2003 08:50:50 -0800 (PST)
Message-Id: <200312101650.hBAGoofx016547@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 43731 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Wed, 10 Dec 2003 16:50:55 -0000

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

Change 43731 by cvance@cvance_g4 on 2003/12/10 08:49:49

	Fix bug: interpvnodelabel may be NULL.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#127 edit
.. //depot/projects/trustedbsd/sebsd/sys/security/mac_test/mac_test.c#11 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#127 (text+ko) ====

@@ -1250,7 +1250,8 @@
 	ASSERT_CRED_LABEL(old->cr_label);
 	ASSERT_CRED_LABEL(new->cr_label);
 	ASSERT_VNODE_LABEL(filelabel);
-	ASSERT_VNODE_LABEL(interpvnodelabel);
+	if (interpvnodelabel != NULL)
+		ASSERT_VNODE_LABEL(interpvnodelabel);
 	if (execlabel != NULL) {
 		ASSERT_CRED_LABEL(execlabel);
 	}

==== //depot/projects/trustedbsd/sebsd/sys/security/mac_test/mac_test.c#11 (text+ko) ====

@@ -1250,7 +1250,8 @@
 	ASSERT_CRED_LABEL(old->cr_label);
 	ASSERT_CRED_LABEL(new->cr_label);
 	ASSERT_VNODE_LABEL(filelabel);
-	ASSERT_VNODE_LABEL(interpvnodelabel);
+	if (interpvnodelabel != NULL)
+		ASSERT_VNODE_LABEL(interpvnodelabel);
 	if (execlabel != NULL) {
 		ASSERT_CRED_LABEL(execlabel);
 	}