From owner-svn-src-all@FreeBSD.ORG  Thu May  3 16:32:10 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 464B3106567A;
	Thu,  3 May 2012 16:32:10 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2C0E58FC22;
	Thu,  3 May 2012 16:32:09 +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 q43GW9Aa051969;
	Thu, 3 May 2012 16:32:09 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q43GW96h051966;
	Thu, 3 May 2012 16:32:09 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201205031632.q43GW96h051966@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 3 May 2012 16:32:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234968 - stable/7/lib/libc/sys
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 May 2012 16:32:10 -0000

Author: eadler
Date: Thu May  3 16:32:09 2012
New Revision: 234968
URL: http://svn.freebsd.org/changeset/base/234968

Log:
  MFC r234131:
  	Return EBADF instead of EMFILE from dup2 when the second argument is
  	outside the range of valid file descriptors
  
  PR:		kern/164970
  Approved by:	cperciva (implicit)

Modified:
  stable/7/lib/libc/sys/dup.2
  stable/7/lib/libc/sys/fcntl.2
Directory Properties:
  stable/7/lib/libc/   (props changed)

Modified: stable/7/lib/libc/sys/dup.2
==============================================================================
--- stable/7/lib/libc/sys/dup.2	Thu May  3 16:31:44 2012	(r234967)
+++ stable/7/lib/libc/sys/dup.2	Thu May  3 16:32:09 2012	(r234968)
@@ -123,20 +123,27 @@ indicates the cause of the error.
 .Sh ERRORS
 The
 .Fn dup
-and
-.Fn dup2
-system calls fail if:
+system call fails if:
 .Bl -tag -width Er
 .It Bq Er EBADF
 The
 .Fa oldd
-or
-.Fa newd
 argument
 is not a valid active descriptor
 .It Bq Er EMFILE
 Too many descriptors are active.
 .El
+The
+.Fn dup2
+system call fails if:
+.Bl -tag -width Er
+.It Bq Er EBADF
+The
+.Fa oldd
+argument is not a valid active descriptor or the
+.Fa newd
+argument is negative or exceeds the maximum allowable descriptor number
+.El
 .Sh SEE ALSO
 .Xr accept 2 ,
 .Xr close 2 ,

Modified: stable/7/lib/libc/sys/fcntl.2
==============================================================================
--- stable/7/lib/libc/sys/fcntl.2	Thu May  3 16:31:44 2012	(r234967)
+++ stable/7/lib/libc/sys/fcntl.2	Thu May  3 16:32:09 2012	(r234968)
@@ -523,8 +523,6 @@ The argument
 .Fa cmd
 is
 .Dv F_DUPFD
-or
-.Dv F_DUP2FD
 and the maximum number of file descriptors permitted for the
 process are already in use,
 or no file descriptors greater than or equal to