diff options
author | Conrad Meyer <cem@FreeBSD.org> | 2016-11-08 05:31:01 +0000 |
---|---|---|
committer | Conrad Meyer <cem@FreeBSD.org> | 2016-11-08 05:31:01 +0000 |
commit | cd1693d3f953314178bc9c1ad75283ed29dc26ba (patch) | |
tree | efe9556fcb7bf108db23dd38c51ce08841c2826d /usr.bin | |
parent | a965389b5a77dc64dd8ddc3c4340eed16698f4fd (diff) | |
download | src-test2-cd1693d3f953314178bc9c1ad75283ed29dc26ba.tar.gz src-test2-cd1693d3f953314178bc9c1ad75283ed29dc26ba.zip |
Notes
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/basename/basename.c | 4 | ||||
-rw-r--r-- | usr.bin/dc/dc.c | 26 | ||||
-rw-r--r-- | usr.bin/dirname/dirname.c | 4 | ||||
-rw-r--r-- | usr.bin/fold/fold.c | 4 | ||||
-rw-r--r-- | usr.bin/getopt/getopt.c | 6 | ||||
-rw-r--r-- | usr.bin/locate/bigram/locate.bigram.c | 6 | ||||
-rw-r--r-- | usr.bin/logname/logname.c | 4 | ||||
-rw-r--r-- | usr.bin/printenv/printenv.c | 5 | ||||
-rw-r--r-- | usr.bin/yes/yes.c | 5 |
9 files changed, 59 insertions, 5 deletions
diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c index 4c1023f0113d..e82dec55bc5c 100644 --- a/usr.bin/basename/basename.c +++ b/usr.bin/basename/basename.c @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)basename.c 8.4 (Berkeley) 5/4/95"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <capsicum_helpers.h> #include <err.h> #include <libgen.h> #include <limits.h> @@ -64,6 +65,9 @@ main(int argc, char **argv) setlocale(LC_ALL, ""); + if (caph_limit_stdio() < 0 || (cap_enter() < 0 && errno != ENOSYS)) + err(1, "capsicum"); + aflag = 0; suffix = NULL; suffixlen = 0; diff --git a/usr.bin/dc/dc.c b/usr.bin/dc/dc.c index 546b24706eee..8f2cf51fb3bd 100644 --- a/usr.bin/dc/dc.c +++ b/usr.bin/dc/dc.c @@ -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(); diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c index c176995cc1c3..0036c60f4228 100644 --- a/usr.bin/dirname/dirname.c +++ b/usr.bin/dirname/dirname.c @@ -39,6 +39,7 @@ static const char sccsid[] = "@(#)dirname.c 8.4 (Berkeley) 5/4/95"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <capsicum_helpers.h> #include <err.h> #include <libgen.h> #include <stdio.h> @@ -53,6 +54,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) { case '?': diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c index 1ce9b5eb3a92..7eedfe252c0a 100644 --- a/usr.bin/fold/fold.c +++ b/usr.bin/fold/fold.c @@ -45,6 +45,7 @@ static char sccsid[] = "@(#)fold.c 8.1 (Berkeley) 6/6/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <capsicum_helpers.h> #include <err.h> #include <limits.h> #include <locale.h> @@ -72,6 +73,9 @@ main(int argc, char **argv) (void) setlocale(LC_CTYPE, ""); + if (caph_limit_stdio() < 0 || (cap_enter() < 0 && errno != ENOSYS)) + err(1, "capsicum"); + width = -1; previous_ch = 0; while ((ch = getopt(argc, argv, "0123456789bsw:")) != -1) { diff --git a/usr.bin/getopt/getopt.c b/usr.bin/getopt/getopt.c index d1671a71e5ee..3f55a34f6d50 100644 --- a/usr.bin/getopt/getopt.c +++ b/usr.bin/getopt/getopt.c @@ -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> @@ -16,6 +19,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) switch (c) { diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c index 6fa2d3112928..90111e7e2516 100644 --- a/usr.bin/locate/bigram/locate.bigram.c +++ b/usr.bin/locate/bigram/locate.bigram.c @@ -57,6 +57,9 @@ static char sccsid[] = "@(#)locate.bigram.c 8.1 (Berkeley) 6/6/93"; * 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 */ @@ -73,6 +76,9 @@ main(void) 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) { /* diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c index 8a251ae4b6d5..05aa881e1b40 100644 --- a/usr.bin/logname/logname.c +++ b/usr.bin/logname/logname.c @@ -39,6 +39,7 @@ static const char sccsid[] = "@(#)logname.c 8.2 (Berkeley) 4/3/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <capsicum_helpers.h> #include <err.h> #include <unistd.h> #include <stdio.h> @@ -51,6 +52,9 @@ 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(); if ((p = getlogin()) == NULL) diff --git a/usr.bin/printenv/printenv.c b/usr.bin/printenv/printenv.c index 27882ab91ce3..4ca91ec66dc5 100644 --- a/usr.bin/printenv/printenv.c +++ b/usr.bin/printenv/printenv.c @@ -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> @@ -65,6 +67,9 @@ main(int argc, char *argv[]) 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) { case '?': diff --git a/usr.bin/yes/yes.c b/usr.bin/yes/yes.c index ef98b4ded12d..2336d3f2c688 100644 --- a/usr.bin/yes/yes.c +++ b/usr.bin/yes/yes.c @@ -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) ; |