From owner-svn-src-head@FreeBSD.ORG  Sat Aug 13 16:03:40 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DA053106566B;
	Sat, 13 Aug 2011 16:03:40 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CA7B88FC12;
	Sat, 13 Aug 2011 16:03:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7DG3ePf023095;
	Sat, 13 Aug 2011 16:03:40 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7DG3e80023093;
	Sat, 13 Aug 2011 16:03:40 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201108131603.p7DG3e80023093@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 13 Aug 2011 16:03:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224842 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Aug 2011 16:03:40 -0000

Author: rwatson
Date: Sat Aug 13 16:03:40 2011
New Revision: 224842
URL: http://svn.freebsd.org/changeset/base/224842

Log:
  When falloc() was broken into separate falloc_noinstall() and finstall(),
  a bug was introduced in kern_openat() such that the error from the vnode
  open operation was overwritten before it was passed as an argument to
  dupfdopen().  This broke operations on /dev/{stdin,stdout,stderr}.  Fix
  by preserving the original error number across finstall() so that it is
  still available.
  
  Approved by:	re (kib)
  Reported by:	cognet

Modified:
  head/sys/kern/vfs_syscalls.c

Modified: head/sys/kern/vfs_syscalls.c
==============================================================================
--- head/sys/kern/vfs_syscalls.c	Sat Aug 13 13:49:11 2011	(r224841)
+++ head/sys/kern/vfs_syscalls.c	Sat Aug 13 16:03:40 2011	(r224842)
@@ -1086,7 +1086,7 @@ kern_openat(struct thread *td, int fd, c
 	struct vnode *vp;
 	int cmode;
 	struct file *nfp;
-	int type, indx = -1, error;
+	int type, indx = -1, error, error_open;
 	struct flock lf;
 	struct nameidata nd;
 	int vfslocked;
@@ -1145,10 +1145,11 @@ kern_openat(struct thread *td, int fd, c
 		    (error == ENODEV || error == ENXIO) &&
 		    (td->td_dupfd >= 0)) {
 			/* XXX from fdopen */
+			error_open = error;
 			if ((error = finstall(td, fp, &indx, flags)) != 0)
 				goto bad_unlocked;
 			if ((error = dupfdopen(td, fdp, indx, td->td_dupfd,
-			    flags, error)) == 0)
+			    flags, error_open)) == 0)
 				goto success;
 		}
 		/*