From owner-svn-src-all@FreeBSD.ORG  Tue Dec 24 07:26:44 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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3E2B44A2;
 Tue, 24 Dec 2013 07:26:44 +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 2A5DE1644;
 Tue, 24 Dec 2013 07:26:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBO7QiS0068152;
 Tue, 24 Dec 2013 07:26:44 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBO7QiFh068151;
 Tue, 24 Dec 2013 07:26:44 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201312240726.rBO7QiFh068151@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Tue, 24 Dec 2013 07:26:44 +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: r259815 - stable/9/sys/fs/fifofs
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.17
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, 24 Dec 2013 07:26:44 -0000

Author: kib
Date: Tue Dec 24 07:26:43 2013
New Revision: 259815
URL: http://svnweb.freebsd.org/changeset/base/259815

Log:
  MFC r259521:
  Do not allow O_EXEC opens for fifo, return EINVAL.

Modified:
  stable/9/sys/fs/fifofs/fifo_vnops.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/fs/   (props changed)

Modified: stable/9/sys/fs/fifofs/fifo_vnops.c
==============================================================================
--- stable/9/sys/fs/fifofs/fifo_vnops.c	Tue Dec 24 07:25:49 2013	(r259814)
+++ stable/9/sys/fs/fifofs/fifo_vnops.c	Tue Dec 24 07:26:43 2013	(r259815)
@@ -194,7 +194,7 @@ fifo_open(ap)
 	int error;
 
 	ASSERT_VOP_ELOCKED(vp, "fifo_open");
-	if (fp == NULL)
+	if (fp == NULL || (ap->a_mode & FEXEC) != 0)
 		return (EINVAL);
 	if ((fip = vp->v_fifoinfo) == NULL) {
 		fip = malloc(sizeof(*fip), M_VNODE, M_WAITOK);