From owner-svn-src-stable@FreeBSD.ORG  Fri Jan 31 20:52:09 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7A4DB5F7;
 Fri, 31 Jan 2014 20:52:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 65CF41840;
 Fri, 31 Jan 2014 20:52:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0VKq9eM097259;
 Fri, 31 Jan 2014 20:52:09 GMT (envelope-from rmh@svn.freebsd.org)
Received: (from rmh@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0VKq92Z097258;
 Fri, 31 Jan 2014 20:52:09 GMT (envelope-from rmh@svn.freebsd.org)
Message-Id: <201401312052.s0VKq92Z097258@svn.freebsd.org>
From: Robert Millan <rmh@FreeBSD.org>
Date: Fri, 31 Jan 2014 20:52:09 +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: r261329 - stable/10/sys/kern
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Jan 2014 20:52:09 -0000

Author: rmh
Date: Fri Jan 31 20:52:08 2014
New Revision: 261329
URL: http://svnweb.freebsd.org/changeset/base/261329

Log:
  MFC r261138:
  Accept O_CLOEXEC in shm_open().

Modified:
  stable/10/sys/kern/uipc_shm.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/uipc_shm.c
==============================================================================
--- stable/10/sys/kern/uipc_shm.c	Fri Jan 31 20:00:00 2014	(r261328)
+++ stable/10/sys/kern/uipc_shm.c	Fri Jan 31 20:52:08 2014	(r261329)
@@ -704,7 +704,7 @@ sys_shm_open(struct thread *td, struct s
 	    (uap->flags & O_ACCMODE) != O_RDWR)
 		return (EINVAL);
 
-	if ((uap->flags & ~(O_ACCMODE | O_CREAT | O_EXCL | O_TRUNC)) != 0)
+	if ((uap->flags & ~(O_ACCMODE | O_CREAT | O_EXCL | O_TRUNC | O_CLOEXEC)) != 0)
 		return (EINVAL);
 
 	fdp = td->td_proc->p_fd;