From owner-svn-src-all@FreeBSD.ORG Mon Dec 17 12:26:11 2012 Return-Path: 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 746C0DED; Mon, 17 Dec 2012 12:26:11 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 553CE8FC0C; Mon, 17 Dec 2012 12:26:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBHCQB4D085894; Mon, 17 Dec 2012 12:26:11 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBHCQBTU085893; Mon, 17 Dec 2012 12:26:11 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201212171226.qBHCQBTU085893@svn.freebsd.org> From: Jilles Tjoelker Date: Mon, 17 Dec 2012 12:26:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r244356 - stable/9/lib/libc/gen X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Dec 2012 12:26:11 -0000 Author: jilles Date: Mon Dec 17 12:26:10 2012 New Revision: 244356 URL: http://svnweb.freebsd.org/changeset/base/244356 Log: MFC r239150: nftw(): Do not check the maxfds argument against OPEN_MAX. Apart from the fact that nothing should have OPEN_MAX as a limit (as opposed to RLIMIT_NOFILE from getrlimit() or _SC_OPEN_MAX from sysconf()), POSIX does not require us to check this. PR: 95239 Submitted by: Todd Miller Modified: stable/9/lib/libc/gen/nftw.c Directory Properties: stable/9/lib/libc/ (props changed) Modified: stable/9/lib/libc/gen/nftw.c ============================================================================== --- stable/9/lib/libc/gen/nftw.c Mon Dec 17 11:12:09 2012 (r244355) +++ stable/9/lib/libc/gen/nftw.c Mon Dec 17 12:26:10 2012 (r244356) @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include int nftw(const char *path, int (*fn)(const char *, const struct stat *, int, @@ -47,7 +46,7 @@ nftw(const char *path, int (*fn)(const c int error = 0, ftsflags, fnflag, postorder, sverrno; /* XXX - nfds is currently unused */ - if (nfds < 1 || nfds > OPEN_MAX) { + if (nfds < 1) { errno = EINVAL; return (-1); }