D7915.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D7915.diff
View Options

	Index: head/usr.bin/hexdump/display.c
	===================================================================
	--- head/usr.bin/hexdump/display.c
	+++ head/usr.bin/hexdump/display.c
	@@ -36,10 +36,13 @@
	__FBSDID("$FreeBSD$");

	#include <sys/param.h>
	+#include <sys/capsicum.h>
	#include <sys/stat.h>

	+#include <capsicum_helpers.h>
	#include <ctype.h>
	#include <err.h>
	+#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	@@ -355,6 +358,19 @@
	return(0);
	statok = 0;
	}
	+
	+ if (caph_limit_stream(fileno(stdin), CAPH_READ) < 0)
	+ err(1, "unable to restrict %s",
	+ statok ? _argv[-1] : "stdin");
	+
	+ /*
	+ * We've opened our last input file; enter capsicum sandbox.
	+ */
	+ if (*_argv == NULL) {
	+ if (cap_enter() < 0 && errno != ENOSYS)
	+ err(1, "unable to enter capability mode");
	+ }
	+
	if (skip)
	doskip(statok ? *_argv : "stdin", statok);
	if (*_argv)
	Index: head/usr.bin/hexdump/hexdump.c
	===================================================================
	--- head/usr.bin/hexdump/hexdump.c
	+++ head/usr.bin/hexdump/hexdump.c
	@@ -42,6 +42,9 @@
	__FBSDID("$FreeBSD$");

	#include <sys/types.h>
	+#include <sys/capsicum.h>
	+#include <capsicum_helpers.h>
	+#include <err.h>
	#include <locale.h>
	#include <stdlib.h>
	#include <stdio.h>
	@@ -76,6 +79,14 @@
	for (tfs = fshead; tfs; tfs = tfs->nextfs)
	rewrite(tfs);

	+ /*
	+ * Cache NLS data, for strerror, for err(3), before entering capability
	+ * mode.
	+ */
	+ caph_cache_catpages();
	+ if (caph_limit_stdio() < 0)
	+ err(1, "capsicum");
	+
	(void)next(argv);
	display();
	exit(exitval);