From owner-p4-projects@FreeBSD.ORG  Mon Jan 25 16:10:03 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A7D34106575B; Mon, 25 Jan 2010 16:10:02 +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 647F41065672
	for <perforce@FreeBSD.org>; Mon, 25 Jan 2010 16:10:02 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5276D8FC08
	for <perforce@FreeBSD.org>; Mon, 25 Jan 2010 16:10:02 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0PGA2QG072206
	for <perforce@FreeBSD.org>; Mon, 25 Jan 2010 16:10:02 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0PGA2VN072204
	for perforce@freebsd.org; Mon, 25 Jan 2010 16:10:02 GMT
	(envelope-from jona@FreeBSD.org)
Date: Mon, 25 Jan 2010 16:10:02 GMT
Message-Id: <201001251610.o0PGA2VN072204@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jona@FreeBSD.org using -f
From: Jonathan Anderson <jona@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 173670 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 25 Jan 2010 16:10:03 -0000

http://p4web.freebsd.org/chv.cgi?CH=173670

Change 173670 by jona@jona-belle-freebsd8 on 2010/01/25 16:09:42

	Fixed dupfdopen() error in kern_openat() - we must finstall() the file to give it a valid descriptor before dupfdopen() is called

Affected files ...

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

Differences ...

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

@@ -74,6 +74,9 @@
 #ifdef KTRACE
 #include <sys/ktrace.h>
 #endif
+#ifdef KDB
+#include <sys/kdb.h>
+#endif
 
 #include <machine/stdarg.h>
 
@@ -1097,7 +1100,7 @@
 	struct mount *mp;
 	int cmode;
 	struct file *nfp;
-	int type, indx, error;
+	int type, indx = -1, error;
 	struct flock lf;
 	struct nameidata nd;
 	int vfslocked;
@@ -1159,10 +1162,17 @@
 		 * it ever should.
 		 */
 		if (!nd.ni_basedir && (error == ENODEV || error == ENXIO) &&
-		    td->td_dupfd >= 0 &&		/* XXX from fdopen */
-		    (error =
-			dupfdopen(td, fdp, indx, td->td_dupfd, flags, error)) == 0)
-			goto success;
+		    td->td_dupfd >= 0) {
+			/* XXX from fdopen */
+			int olderror = error;
+
+			if ((error = finstall(td, fp, &indx)) != 0)
+				goto bad_unlocked;
+
+			if ((error = dupfdopen(td, fdp, indx, td->td_dupfd,
+			                      flags, olderror)) == 0)
+				goto success;
+		}
 
 		/*
 		 * Clean up the descriptor, but only if another thread hadn't
@@ -1238,8 +1248,10 @@
 	}
 	else
 #endif
-	if ((error = finstall(td, fp, &indx)) != 0)
-		goto bad_unlocked;
+	/* if we haven't already installed the FD (for dupfdopen), do so now */
+	if (indx == -1)
+	       if((error = finstall(td, fp, &indx)) != 0)
+			goto bad_unlocked;
 
 	/*
 	 * Release our private reference, leaving the one associated with