From owner-p4-projects  Tue Apr 30 12: 6:32 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4B29837B420; Tue, 30 Apr 2002 12:06:28 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 7FF7B37B400
	for <perforce@freebsd.org>; Tue, 30 Apr 2002 12:06:27 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g3UJ6R853857
	for perforce@freebsd.org; Tue, 30 Apr 2002 12:06:27 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 30 Apr 2002 12:06:27 -0700 (PDT)
Message-Id: <200204301906.g3UJ6R853857@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 10532 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=10532

Change 10532 by rwatson@rwatson_curry on 2002/04/30 12:06:15

	Grab a vnode lock before entering mac_cred_check_open_vnode()
	to prevent assertion failures in fcntl() with F_SETFL.  Possibly
	eventually this hook should change some.

Affected files ...

... //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#14 edit

Differences ...

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

@@ -323,8 +323,11 @@
 				mode |= VWRITE;
 			if (fflag & O_APPEND)
 				mode |= VAPPEND;
+			vn_lock((struct vnode *)fp->f_data, LK_EXCLUSIVE |
+			    LK_RETRY, td);
 			error = mac_cred_check_open_vnode(td->td_ucred,
 			    (struct vnode *)fp->f_data, mode);
+			VOP_UNLOCK((struct vnode *)fp->f_data, 0, td);
 			if (error) {
 				fdrop(fp, td);
 				break;

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