Page MenuHomeFreeBSD
Files F153188882

D14408.id39586.diff
No OneTemporary
Actions

D14408.id39586.diff
View Options

Index: usr.bin/wc/Makefile
===================================================================
--- usr.bin/wc/Makefile
+++ usr.bin/wc/Makefile
@@ -1,7 +1,15 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
+.include <src.opts.mk>
+
PROG= wc
LIBADD= xo
+.if ${MK_CASPER} != "no"
+LIBADD+= casper
+LIBADD+= cap_fileargs
+CFLAGS+=-DWITH_CASPER
+.endif
+
.include <bsd.prog.mk>
Index: usr.bin/wc/wc.c
===================================================================
--- usr.bin/wc/wc.c
+++ usr.bin/wc/wc.c
@@ -46,7 +46,9 @@
#include <sys/param.h>
#include <sys/stat.h>
+#include <sys/capsicum.h>
+#include <capsicum_helpers.h>
#include <ctype.h>
#include <err.h>
#include <errno.h>
@@ -61,6 +63,10 @@
#include <wctype.h>
#include <libxo/xo.h>
+#include <libcasper.h>
+#include <casper/cap_fileargs.h>
+
+static fileargs_t *fa;
static uintmax_t tlinect, twordct, tcharct, tlongline;
static int doline, doword, dochar, domulti, dolongline;
static volatile sig_atomic_t siginfo;
@@ -90,6 +96,7 @@
main(int argc, char *argv[])
{
int ch, errors, total;
+ cap_rights_t rights;
(void) setlocale(LC_CTYPE, "");
@@ -125,6 +132,26 @@
(void)signal(SIGINFO, siginfo_handler);
+ fa = fileargs_init(argc, argv, O_RDONLY, 0,
+ cap_rights_init(&rights, CAP_READ, CAP_FSTAT));
+ if (fa == NULL) {
+ xo_warn("Unable to init casper");
+ exit(1);
+ }
+
+ caph_cache_catpages();
+ if (caph_limit_stdio() < 0) {
+ xo_warn("Unable to limit stdio");
+ fileargs_free(fa);
+ exit(1);
+ }
+
+ if (cap_enter() < 0 && errno != ENOSYS) {
+ xo_warn("Unable to enter capability mode");
+ fileargs_free(fa);
+ exit(1);
+ }
+
/* Wc's flags are on by default. */
if (doline + doword + dochar + domulti + dolongline == 0)
doline = doword = dochar = 1;
@@ -158,6 +185,7 @@
xo_close_container("total");
}
+ fileargs_free(fa);
xo_close_container("wc");
xo_finish();
exit(errors == 0 ? 0 : 1);
@@ -206,7 +234,7 @@
linect = wordct = charct = llct = tmpll = 0;
if (file == NULL)
fd = STDIN_FILENO;
- else if ((fd = open(file, O_RDONLY, 0)) < 0) {
+ else if ((fd = fileargs_open(fa, file)) < 0) {
xo_warn("%s: open", file);
return (1);
}

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 20, 4:58 PM (22 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31817873
Default Alt Text
D14408.id39586.diff (2 KB)

Event Timeline