From owner-p4-projects  Sat Nov 16 20:28: 3 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E8EDC37B404; Sat, 16 Nov 2002 20:28:01 -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 83D0437B401
	for <perforce@freebsd.org>; Sat, 16 Nov 2002 20:28:01 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3F70A43E9C
	for <perforce@freebsd.org>; Sat, 16 Nov 2002 20:28:01 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAH4PFmV023871
	for <perforce@freebsd.org>; Sat, 16 Nov 2002 20:25:15 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAH4PFmS023868
	for perforce@freebsd.org; Sat, 16 Nov 2002 20:25:15 -0800 (PST)
Date: Sat, 16 Nov 2002 20:25:15 -0800 (PST)
Message-Id: <200211170425.gAH4PFmS023868@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 21130 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 21130 by rwatson@rwatson_paprika on 2002/11/16 20:24:45

	vp!=NULL is an invariant for mac_check_kld_load(), so don't
	attempt to handle vp!=NULL.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#364 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#364 (text+ko) ====

@@ -2321,15 +2321,12 @@
 {
 	int error;
 
-	if (vp != NULL) {
-		ASSERT_VOP_LOCKED(vp, "mac_check_system_acct");
-	}
+	ASSERT_VOP_LOCKED(vp, "mac_check_kld_load");
 
 	if (!mac_enforce_system)
 		return (0);
 
-	MAC_CHECK(check_kld_load, cred, vp,
-	    vp != NULL ? &vp->v_label : NULL);
+	MAC_CHECK(check_kld_load, cred, vp, &vp->v_label);
 
 	return (error);
 }

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message