From owner-svn-src-all@FreeBSD.ORG  Tue Jun 11 18:43:27 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D817BB75;
 Tue, 11 Jun 2013 18:43:27 +0000 (UTC)
 (envelope-from ghelmer@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 CAC3C145D;
 Tue, 11 Jun 2013 18:43:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BIhRFg047687;
 Tue, 11 Jun 2013 18:43:27 GMT (envelope-from ghelmer@svn.freebsd.org)
Received: (from ghelmer@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BIhR0I047686;
 Tue, 11 Jun 2013 18:43:27 GMT (envelope-from ghelmer@svn.freebsd.org)
Message-Id: <201306111843.r5BIhR0I047686@svn.freebsd.org>
From: Guy Helmer <ghelmer@FreeBSD.org>
Date: Tue, 11 Jun 2013 18:43:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251625 - head/libexec/atrun
X-SVN-Group: head
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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Jun 2013 18:43:27 -0000

Author: ghelmer
Date: Tue Jun 11 18:43:27 2013
New Revision: 251625
URL: http://svnweb.freebsd.org/changeset/base/251625

Log:
  Prevent races running the queue by serializing access to the
  queue directory.
  
  PR:		bin/113239

Modified:
  head/libexec/atrun/atrun.c

Modified: head/libexec/atrun/atrun.c
==============================================================================
--- head/libexec/atrun/atrun.c	Tue Jun 11 18:43:25 2013	(r251624)
+++ head/libexec/atrun/atrun.c	Tue Jun 11 18:43:27 2013	(r251625)
@@ -31,6 +31,7 @@ static const char rcsid[] =
 /* System Headers */
 
 #include <sys/fcntl.h>
+#include <sys/file.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifdef __FreeBSD__
@@ -521,6 +522,9 @@ main(int argc, char *argv[])
     if ((spool = opendir(".")) == NULL)
 	perr("cannot read %s", ATJOB_DIR);
 
+    if (flock(dirfd(spool), LOCK_EX) == -1)
+	perr("cannot lock %s", ATJOB_DIR);
+
     now = time(NULL);
     run_batch = 0;
     batch_uid = (uid_t) -1;