From owner-p4-projects  Sat Oct  5 18: 9:28 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EA81937B404; Sat,  5 Oct 2002 18:09:26 -0700 (PDT)
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 8341137B401
	for <perforce@freebsd.org>; Sat,  5 Oct 2002 18:09:26 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4161B43E65
	for <perforce@freebsd.org>; Sat,  5 Oct 2002 18:09:26 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g9619QCo000446
	for <perforce@freebsd.org>; Sat, 5 Oct 2002 18:09:26 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g9619Pvo000443
	for perforce@freebsd.org; Sat, 5 Oct 2002 18:09:25 -0700 (PDT)
Date: Sat, 5 Oct 2002 18:09:25 -0700 (PDT)
Message-Id: <200210060109.g9619Pvo000443@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 18771 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://people.freebsd.org/~peter/p4db/chv.cgi?CH=18771

Change 18771 by rwatson@rwatson_tislabs on 2002/10/05 18:08:40

	Rather than do a redundant set of the requested protections
	if we've disable fs or vm checks in the mmap downgrade,
	actually just return without modifying the call-by-reference
	argument.

Affected files ...

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

Differences ...

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

@@ -2330,7 +2330,7 @@
 	ASSERT_VOP_LOCKED(vp, "mac_check_vnode_mmap_downgrade");
 
 	if (!mac_enforce_fs || !mac_enforce_vm)
-		*prot = result;
+		return;
 
 	MAC_PERFORM(check_vnode_mmap_downgrade, cred, vp, &vp->v_label,
 	    &result);

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