From owner-svn-src-head@freebsd.org  Fri Oct  7 19:02:14 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 5A861C05C13;
 Fri,  7 Oct 2016 19:02:14 +0000 (UTC)
 (envelope-from oshogbo@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 2C7C6C15;
 Fri,  7 Oct 2016 19:02:14 +0000 (UTC)
 (envelope-from oshogbo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u97J2DES070593;
 Fri, 7 Oct 2016 19:02:13 GMT (envelope-from oshogbo@FreeBSD.org)
Received: (from oshogbo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u97J2DHJ070592;
 Fri, 7 Oct 2016 19:02:13 GMT (envelope-from oshogbo@FreeBSD.org)
Message-Id: <201610071902.u97J2DHJ070592@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to
 oshogbo@FreeBSD.org using -f
From: Mariusz Zaborski <oshogbo@FreeBSD.org>
Date: Fri, 7 Oct 2016 19:02:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r306820 - head/usr.bin/cmp
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Oct 2016 19:02:14 -0000

Author: oshogbo
Date: Fri Oct  7 19:02:13 2016
New Revision: 306820
URL: https://svnweb.freebsd.org/changeset/base/306820

Log:
  Restrict stdin if it's not in use.
  
  Reviewed by:	emaste, cem
  Differential Revision:	https://reviews.freebsd.org/D8184

Modified:
  head/usr.bin/cmp/cmp.c

Modified: head/usr.bin/cmp/cmp.c
==============================================================================
--- head/usr.bin/cmp/cmp.c	Fri Oct  7 18:56:24 2016	(r306819)
+++ head/usr.bin/cmp/cmp.c	Fri Oct  7 19:02:13 2016	(r306820)
@@ -164,6 +164,14 @@ main(int argc, char *argv[])
 	if (cap_fcntls_limit(fd2, fcntls) < 0 && errno != ENOSYS)
 		err(ERR_EXIT, "unable to limit fcntls for %s", file2);
 
+	if (!special) {
+		cap_rights_init(&rights);
+		if (cap_rights_limit(STDIN_FILENO, &rights) < 0 &&
+		    errno != ENOSYS) {
+			err(ERR_EXIT, "unable to limit stdio");
+		}
+	}
+
 	if (caph_limit_stdout() == -1 || caph_limit_stderr() == -1)
 		err(ERR_EXIT, "unable to limit stdio");