PERFORCE change 21130 for review

[Robert Watson]

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

Change 21130 by rwatson at 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 at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message