From owner-svn-src-all@freebsd.org  Sat Apr  9 19:29:40 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84DB3B09360;
 Sat,  9 Apr 2016 19:29:40 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 47FDA115B;
 Sat,  9 Apr 2016 19:29:40 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u39JTdeO080920;
 Sat, 9 Apr 2016 19:29:39 GMT (envelope-from jilles@FreeBSD.org)
Received: (from jilles@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u39JTdav080919;
 Sat, 9 Apr 2016 19:29:39 GMT (envelope-from jilles@FreeBSD.org)
Message-Id: <201604091929.u39JTdav080919@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jilles set sender to
 jilles@FreeBSD.org using -f
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sat, 9 Apr 2016 19:29:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r297759 - stable/10/lib/libc/sys
X-SVN-Group: stable-10
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.21
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Apr 2016 19:29:40 -0000

Author: jilles
Date: Sat Apr  9 19:29:39 2016
New Revision: 297759
URL: https://svnweb.freebsd.org/changeset/base/297759

Log:
  MFC r287753: setuid(2): Suggest O_CLOEXEC instead of fcntl(F_SETFD).

Modified:
  stable/10/lib/libc/sys/setuid.2
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/sys/setuid.2
==============================================================================
--- stable/10/lib/libc/sys/setuid.2	Sat Apr  9 19:09:06 2016	(r297758)
+++ stable/10/lib/libc/sys/setuid.2	Sat Apr  9 19:29:39 2016	(r297759)
@@ -28,7 +28,7 @@
 .\"     @(#)setuid.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd June 4, 1993
+.Dd September 13, 2015
 .Dt SETUID 2
 .Os
 .Sh NAME
@@ -178,15 +178,10 @@ pseudocode(void)
 	int fd;
 	/* ... */
 
-	fd = open("/path/to/sensitive/data", O_RDWR);
+	fd = open("/path/to/sensitive/data", O_RDWR | O_CLOEXEC);
 	if (fd == -1)
 		err(1, "open");
 
-	/*
-	 * Set close-on-exec flag; see fcntl(2) for more information.
-	 */
-	if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
-		err(1, "fcntl(F_SETFD)");
 	/* ... */
 	execve(path, argv, environ);
 }