Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Apr 2018 03:30:10 +0000 (UTC)
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r332463 - in stable/11: bin/echo bin/sleep usr.bin/basename usr.bin/dc usr.bin/dirname usr.bin/getopt usr.bin/locate/bigram usr.bin/logname usr.bin/printenv usr.bin/yes
Message-ID:  <201804130330.w3D3UAdv040682@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kevans
Date: Fri Apr 13 03:30:10 2018
New Revision: 332463
URL: https://svnweb.freebsd.org/changeset/base/332463

Log:
  MFC r308432, r308657: Capsicumize some trivial stdio programs
  
  r308432: Capsicumize some trivial stdio programs
  
  Trivially capsicumize some simple programs that just interact with
  stdio.  This list of programs uses 'pledge("stdio")' in OpenBSD.
  
  r308657: fold(1): Revert incorrect r308432
  
  As Jean-Sébastien notes, fold(1) requires handling argv-supplied files. That
  will require a slightly more sophisticated approach.

Modified:
  stable/11/bin/echo/echo.c
  stable/11/bin/sleep/sleep.c
  stable/11/usr.bin/basename/basename.c
  stable/11/usr.bin/dc/dc.c
  stable/11/usr.bin/dirname/dirname.c
  stable/11/usr.bin/getopt/getopt.c
  stable/11/usr.bin/locate/bigram/locate.bigram.c
  stable/11/usr.bin/logname/logname.c
  stable/11/usr.bin/printenv/printenv.c
  stable/11/usr.bin/yes/yes.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/bin/echo/echo.c
==============================================================================
--- stable/11/bin/echo/echo.c	Fri Apr 13 02:40:10 2018	(r332462)
+++ stable/11/bin/echo/echo.c	Fri Apr 13 03:30:10 2018	(r332463)
@@ -45,6 +45,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>
 
 #include <assert.h>
+#include <capsicum_helpers.h>
+#include <err.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -77,6 +79,9 @@ main(int argc, char *argv[])
 	char space[] = " ";
 	char newline[] = "\n";
 	char *progname = argv[0];
+
+	if (caph_limit_stdio() < 0 || (cap_enter() < 0 && errno != ENOSYS))
+		err(1, "capsicum");
 
 	/* This utility may NOT do getopt(3) option parsing. */
 	if (*++argv && !strcmp(*argv, "-n")) {

Modified: stable/11/bin/sleep/sleep.c
==============================================================================
--- stable/11/bin/sleep/sleep.c	Fri Apr 13 02:40:10 2018	(r332462)
+++ stable/11/bin/sleep/sleep.c	Fri Apr 13 03:30:10 2018	(r332463)
@@ -41,6 +41,7 @@ static char sccsid[] = "@(#)sleep.c	8.3 (Berkeley) 4/2
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <capsicum_helpers.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
@@ -68,6 +69,9 @@ main(int argc, char *argv[])
 	double d;
 	time_t original;
 	char buf[2];
+
+	if (caph_limit_stdio() < 0 || (cap_enter() < 0 && errno != ENOSYS))
+		err(1, "capsicum");
 
 	if (argc != 2)
 		usage();

Modified: stable/11/usr.bin/basename/basename.c
==============================================================================
--- stable/11/usr.bin/basename/basename.c	Fri Apr 13 02:40:10 2018	(r332462)
+++ stable/11/usr.bin/basename/basename.c	Fri Apr 13 03:30:10 2018	(r332463)
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)basename.c	8.4 (Berkeley) 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <capsicum_helpers.h>
 #include <err.h>
 #include <libgen.h>
 #include <limits.h>
@@ -63,6 +64,9 @@ main(int argc, char **argv)
 	int aflag, ch;
 
 	setlocale(LC_ALL, "");
+
+	if (caph_limit_stdio() < 0 || (cap_enter() < 0 && errno != ENOSYS))
+		err(1, "capsicum");
 
 	aflag = 0;
 	suffix = NULL;

Modified: stable/11/usr.bin/dc/dc.c
==============================================================================
--- stable/11/usr.bin/dc/dc.c	Fri Apr 13 02:40:10 2018	(r332462)
+++ stable/11/usr.bin/dc/dc.c	Fri Apr 13 03:30:10 2018	(r332463)
@@ -22,9 +22,11 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/stat.h>
 
+#include <capsicum_helpers.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -58,11 +60,11 @@ usage(void)
 }
 
 static void
-procfile(char *fname) {
+procfd(int fd, char *fname) {
 	struct stat st;
 	FILE *file;
 
-	file = fopen(fname, "r");
+	file = fdopen(fd, "r");
 	if (file == NULL)
 		err(1, "cannot open file %s", fname);
 	if (fstat(fileno(file), &st) == -1)
@@ -80,7 +82,7 @@ procfile(char *fname) {
 int
 main(int argc, char *argv[])
 {
-	int ch;
+	int ch, fd;
 	bool extended_regs = false, preproc_done = false;
 
 	/* accept and ignore a single dash to be 4.4BSD dc(1) compatible */
@@ -97,7 +99,10 @@ main(int argc, char *argv[])
 		case 'f':
 			if (!preproc_done)
 				init_bmachine(extended_regs);
-			procfile(optarg);
+			fd = open(optarg, O_RDONLY);
+			if (fd < 0)
+				err(1, "cannot open file %s", optarg);
+			procfd(fd, optarg);
 			preproc_done = true;
 			break;
 		case 'x':
@@ -126,12 +131,23 @@ main(int argc, char *argv[])
 	if (argc > 1)
 		usage();
 	if (argc == 1) {
-		procfile(argv[0]);
+		fd = open(argv[0], O_RDONLY);
+		if (fd < 0)
+			err(1, "cannot open file %s", argv[0]);
+
+		if (caph_limit_stream(fd, CAPH_READ) < 0 ||
+		    caph_limit_stdio() < 0 ||
+		    (cap_enter() < 0 && errno != ENOSYS))
+			err(1, "capsicum");
+
+		procfd(fd, argv[0]);
 		preproc_done = true;
 	}
 	if (preproc_done)
 		return (0);
 
+	if (caph_limit_stdio() < 0 || (cap_enter() < 0 && errno != ENOSYS))
+		err(1, "capsicum");
 	src_setstream(&src, stdin);
 	reset_bmachine(&src);
 	eval();

Modified: stable/11/usr.bin/dirname/dirname.c
==============================================================================
--- stable/11/usr.bin/dirname/dirname.c	Fri Apr 13 02:40:10 2018	(r332462)
+++ stable/11/usr.bin/dirname/dirname.c	Fri Apr 13 03:30:10 2018	(r332463)
@@ -39,6 +39,7 @@ static const char sccsid[] = "@(#)dirname.c	8.4 (Berke
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <capsicum_helpers.h>
 #include <err.h>
 #include <libgen.h>
 #include <stdio.h>
@@ -52,6 +53,9 @@ main(int argc, char **argv)
 {
 	char *p;
 	int ch;
+
+	if (caph_limit_stdio() < 0 || (cap_enter() < 0 && errno != ENOSYS))
+		err(1, "capsicum");
 
 	while ((ch = getopt(argc, argv, "")) != -1)
 		switch(ch) {

Modified: stable/11/usr.bin/getopt/getopt.c
==============================================================================
--- stable/11/usr.bin/getopt/getopt.c	Fri Apr 13 02:40:10 2018	(r332462)
+++ stable/11/usr.bin/getopt/getopt.c	Fri Apr 13 03:30:10 2018	(r332463)
@@ -6,6 +6,9 @@ __FBSDID("$FreeBSD$");
  * into the public domain and is thus not subject to any copyright.
  */
 
+#include <capsicum_helpers.h>
+#include <err.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -15,6 +18,9 @@ main(int argc, char *argv[])
 {
 	int c;
 	int status = 0;
+
+	if (caph_limit_stdio() < 0 || (cap_enter() < 0 && errno != ENOSYS))
+		err(1, "capsicum");
 
 	optind = 2;	/* Past the program name and the option letters. */
 	while ((c = getopt(argc, argv, argv[1])) != -1)

Modified: stable/11/usr.bin/locate/bigram/locate.bigram.c
==============================================================================
--- stable/11/usr.bin/locate/bigram/locate.bigram.c	Fri Apr 13 02:40:10 2018	(r332462)
+++ stable/11/usr.bin/locate/bigram/locate.bigram.c	Fri Apr 13 03:30:10 2018	(r332463)
@@ -57,6 +57,9 @@ static char sccsid[] = "@(#)locate.bigram.c	8.1 (Berke
  * Use 'code' to encode a file using this output.
  */
 
+#include <capsicum_helpers.h>
+#include <err.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/param.h>			/* for MAXPATHLEN */
@@ -72,6 +75,9 @@ main(void)
 	u_char *cp;
 	u_char *oldpath = buf1, *path = buf2;
 	u_int i, j;
+
+	if (caph_limit_stdio() < 0 || (cap_enter() < 0 && errno != ENOSYS))
+		err(1, "capsicum");
 
      	while (fgets(path, sizeof(buf2), stdin) != NULL) {
 

Modified: stable/11/usr.bin/logname/logname.c
==============================================================================
--- stable/11/usr.bin/logname/logname.c	Fri Apr 13 02:40:10 2018	(r332462)
+++ stable/11/usr.bin/logname/logname.c	Fri Apr 13 03:30:10 2018	(r332463)
@@ -39,6 +39,7 @@ static const char sccsid[] = "@(#)logname.c	8.2 (Berke
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <capsicum_helpers.h>
 #include <err.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -50,6 +51,9 @@ int
 main(int argc, char *argv[] __unused)
 {
 	char *p;
+
+	if (caph_limit_stdio() < 0 || (cap_enter() < 0 && errno != ENOSYS))
+		err(1, "capsicum");
 
 	if (argc != 1)
 		usage();

Modified: stable/11/usr.bin/printenv/printenv.c
==============================================================================
--- stable/11/usr.bin/printenv/printenv.c	Fri Apr 13 02:40:10 2018	(r332462)
+++ stable/11/usr.bin/printenv/printenv.c	Fri Apr 13 03:30:10 2018	(r332463)
@@ -44,6 +44,8 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
+#include <capsicum_helpers.h>
+#include <err.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -64,6 +66,9 @@ main(int argc, char *argv[])
 	char *cp, **ep;
 	size_t len;
 	int ch;
+
+	if (caph_limit_stdio() < 0 || (cap_enter() < 0 && errno != ENOSYS))
+		err(1, "capsicum");
 
 	while ((ch = getopt(argc, argv, "")) != -1)
 		switch(ch) {

Modified: stable/11/usr.bin/yes/yes.c
==============================================================================
--- stable/11/usr.bin/yes/yes.c	Fri Apr 13 02:40:10 2018	(r332462)
+++ stable/11/usr.bin/yes/yes.c	Fri Apr 13 03:30:10 2018	(r332463)
@@ -41,12 +41,17 @@ static const char rcsid[] = "$FreeBSD$";
 #endif
 #endif /* not lint */
 
+#include <capsicum_helpers.h>
 #include <err.h>
 #include <stdio.h>
 
 int
 main(int argc, char **argv)
 {
+
+	if (caph_limit_stdio() < 0 || (cap_enter() < 0 && errno != ENOSYS))
+		err(1, "capsicum");
+
 	if (argc > 1)
 		while (puts(argv[1]) != EOF)
 			;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804130330.w3D3UAdv040682>