Page MenuHomeFreeBSD
Files F104158981

D17967.diff
No OneTemporary
Actions

D17967.diff
View Options

Index: usr.bin/brandelf/Makefile
===================================================================
--- usr.bin/brandelf/Makefile
+++ usr.bin/brandelf/Makefile
@@ -1,5 +1,13 @@
# $FreeBSD$
+.include <src.opts.mk>
+
PROG= brandelf
+.if ${MK_CASPER} != "no"
+LIBADD+= casper
+LIBADD+= cap_fileargs
+CFLAGS+=-DWITH_CASPER
+.endif
+
.include <bsd.prog.mk>
Index: usr.bin/brandelf/brandelf.c
===================================================================
--- usr.bin/brandelf/brandelf.c
+++ usr.bin/brandelf/brandelf.c
@@ -32,10 +32,12 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/capsicum.h>
#include <sys/types.h>
#include <sys/elf_common.h>
#include <sys/errno.h>
+#include <capsicum_helpers.h>
#include <err.h>
#include <fcntl.h>
#include <stdbool.h>
@@ -44,6 +46,9 @@
#include <string.h>
#include <unistd.h>
+#include <libcasper.h>
+#include <casper/cap_fileargs.h>
+
static int elftype(const char *);
static const char *iselftype(int);
static void printelftypes(void);
@@ -66,8 +71,10 @@
{
const char *strtype = "FreeBSD";
- int ch, retval, type;
+ int ch, flags, retval, type;
bool change, force, listed;
+ fileargs_t *fa;
+ cap_rights_t rights;
type = ELFOSABI_FREEBSD;
retval = 0;
@@ -121,11 +128,24 @@
usage();
}
+ flags = change || force ? O_RDWR : O_RDONLY;
+ cap_rights_init(&rights, CAP_READ, CAP_SEEK);
+ if (flags == O_RDWR)
+ cap_rights_set(&rights, CAP_WRITE);
+
+ fa = fileargs_init(argc, argv, flags, 0, &rights);
+ if (fa == NULL)
+ errx(1, "unable to init casper");
+
+ caph_cache_catpages();
+ if (caph_limit_stdio() < 0 || caph_enter_casper() < 0)
+ err(1, "unable to enter capability mode");
+
while (argc != 0) {
int fd;
char buffer[EI_NIDENT];
- if ((fd = open(argv[0], change || force ? O_RDWR : O_RDONLY, 0)) < 0) {
+ if ((fd = fileargs_open(fa, argv[0])) < 0) {
warn("error opening file %s", argv[0]);
retval = 1;
goto fail;
@@ -167,6 +187,7 @@
argv++;
}
+ fileargs_free(fa);
return retval;
}

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 5, 5:06 AM (12 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15045268
Default Alt Text
D17967.diff (1 KB)

Event Timeline