From owner-svn-src-head@freebsd.org  Wed Apr 19 20:27:50 2017
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 38F05D46D4C;
 Wed, 19 Apr 2017 20:27:50 +0000 (UTC)
 (envelope-from manu@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 0961E1BC2;
 Wed, 19 Apr 2017 20:27:49 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3JKRnrW087042;
 Wed, 19 Apr 2017 20:27:49 GMT (envelope-from manu@FreeBSD.org)
Received: (from manu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3JKRnOa087041;
 Wed, 19 Apr 2017 20:27:49 GMT (envelope-from manu@FreeBSD.org)
Message-Id: <201704192027.v3JKRnOa087041@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: manu set sender to
 manu@FreeBSD.org using -f
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Wed, 19 Apr 2017 20:27:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r317165 - head/usr.bin/pom
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: Wed, 19 Apr 2017 20:27:50 -0000

Author: manu
Date: Wed Apr 19 20:27:48 2017
New Revision: 317165
URL: https://svnweb.freebsd.org/changeset/base/317165

Log:
  Capsicumize pom
  
  Since pom is the only binary that can save lives, capsicumize it to be
  sure that it's safe to run it.
  
  Reviewed by:	bapt

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

Modified: head/usr.bin/pom/pom.c
==============================================================================
--- head/usr.bin/pom/pom.c	Wed Apr 19 20:27:13 2017	(r317164)
+++ head/usr.bin/pom/pom.c	Wed Apr 19 20:27:48 2017	(r317165)
@@ -53,6 +53,11 @@ __FBSDID("$FreeBSD$");
  *
  */
 
+#include <sys/capsicum.h>
+#include <capsicum_helpers.h>
+
+#include <err.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -81,6 +86,7 @@ static void	usage(char *progname);
 int
 main(int argc, char **argv)
 {
+	cap_rights_t rights;
 	time_t tt;
 	struct tm GMT, tmd;
 	double days, today, tomorrow;
@@ -88,6 +94,14 @@ main(int argc, char **argv)
 	char *odate = NULL, *otime = NULL;
 	char *progname = argv[0];
 
+	if (caph_limit_stdio() < 0)
+		err(1, "unable to limit capabitilities for stdio");
+	cap_rights_init(&rights, CAP_WRITE);
+
+	caph_cache_catpages();
+	if (cap_enter() < 0 && errno != ENOSYS)
+		err(1, "unable to enter capability mode");
+
 	while ((ch = getopt(argc, argv, "d:pt:")) != -1)
 		switch (ch) {
 		case 'd':