From owner-p4-projects@FreeBSD.ORG  Mon Jan 21 16:39:24 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C638F16A41B; Mon, 21 Jan 2008 16:39:24 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8B3CF16A46B
	for <perforce@freebsd.org>; Mon, 21 Jan 2008 16:39:24 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7A42613C465
	for <perforce@freebsd.org>; Mon, 21 Jan 2008 16:39:24 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0LGdOn0055275
	for <perforce@freebsd.org>; Mon, 21 Jan 2008 16:39:24 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0LGdO7H055272
	for perforce@freebsd.org; Mon, 21 Jan 2008 16:39:24 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 21 Jan 2008 16:39:24 GMT
Message-Id: <200801211639.m0LGdO7H055272@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>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 133793 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 21 Jan 2008 16:39:25 -0000

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

Change 133793 by rwatson@rwatson_freebsd_capabilities on 2008/01/21 16:38:31

	Use fget_locked() for getvnode/getvnode_cap, as in getsock.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#3 (text+ko) ====

@@ -121,8 +121,8 @@
 		error = EBADF;
 	else {
 		FILEDESC_SLOCK(fdp);
-		if ((u_int)fd >= fdp->fd_nfiles ||
-		    (fp = fdp->fd_ofiles[fd]) == NULL)
+		fp = fget_locked(fdp, fd);
+		if (fp == NULL)
 			error = EBADF;
 		else if (fp->f_vnode == NULL) {
 			fp = NULL;
@@ -155,10 +155,9 @@
 		return (EBADF);
 	}
 	FILEDESC_SLOCK(fdp);
-	if ((u_int)fd >= fdp->fd_nfiles ||
-	    (fp = fdp->fd_ofiles[fd]) == NULL) {
+	fp = fget_locked(fdp, fd);
+	if (fp == NULL) {
 		error = EBADF;
-		fp = NULL;
 		goto out;
 	}