From owner-svn-src-all@FreeBSD.ORG  Wed Jan 11 16:35:26 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CA787106566C;
	Wed, 11 Jan 2012 16:35:26 +0000 (UTC)
	(envelope-from ghelmer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B8C4C8FC0A;
	Wed, 11 Jan 2012 16:35:26 +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 q0BGZQZh067530;
	Wed, 11 Jan 2012 16:35:26 GMT (envelope-from ghelmer@svn.freebsd.org)
Received: (from ghelmer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0BGZQmQ067528;
	Wed, 11 Jan 2012 16:35:26 GMT (envelope-from ghelmer@svn.freebsd.org)
Message-Id: <201201111635.q0BGZQmQ067528@svn.freebsd.org>
From: Guy Helmer <ghelmer@FreeBSD.org>
Date: Wed, 11 Jan 2012 16:35:26 +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: r229966 - head/lib/libutil
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: Wed, 11 Jan 2012 16:35:26 -0000

Author: ghelmer
Date: Wed Jan 11 16:35:26 2012
New Revision: 229966
URL: http://svn.freebsd.org/changeset/base/229966

Log:
  jilles pointed out that O_CLOEXEC could be used in the open(2) flags
  rather than using fcntl(2) later, and in addition to saving a system
  call, removes a possible race with fork/exec from threads or signal
  handlers.

Modified:
  head/lib/libutil/pidfile.c

Modified: head/lib/libutil/pidfile.c
==============================================================================
--- head/lib/libutil/pidfile.c	Wed Jan 11 15:00:16 2012	(r229965)
+++ head/lib/libutil/pidfile.c	Wed Jan 11 16:35:26 2012	(r229966)
@@ -117,7 +117,7 @@ pidfile_open(const char *path, mode_t mo
 	 * pidfile_write() can be called multiple times.
 	 */
 	fd = flopen(pfh->pf_path,
-	    O_WRONLY | O_CREAT | O_TRUNC | O_NONBLOCK, mode);
+	    O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_NONBLOCK, mode);
 	if (fd == -1) {
 		if (errno == EWOULDBLOCK && pidptr != NULL) {
 			count = 20;
@@ -139,19 +139,6 @@ pidfile_open(const char *path, mode_t mo
 	}
 
 	/*
-	 * Prevent the file descriptor from escaping to other
-	 * programs via exec(3).
-	 */
-	if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) {
-		error = errno;
-		unlink(pfh->pf_path);
-		close(fd);
-		free(pfh);
-		errno = error;
-		return (NULL);
-	}
-
-	/*
 	 * Remember file information, so in pidfile_write() we are sure we write
 	 * to the proper descriptor.
 	 */