Page MenuHomeFreeBSD
Files F166825456

D21107.id62761.diff
No OneTemporary
Actions

D21107.id62761.diff
View Options

Index: contrib/elftoolchain/nm/nm.c
===================================================================
--- contrib/elftoolchain/nm/nm.c
+++ contrib/elftoolchain/nm/nm.c
@@ -29,6 +29,7 @@
#include <sys/stat.h>
#include <ar.h>
#include <assert.h>
+#include <capsicum_helpers.h>
#include <ctype.h>
#include <dwarf.h>
#include <err.h>
@@ -46,6 +47,9 @@
#include <strings.h>
#include <unistd.h>
+#include <libcasper.h>
+#include <casper/cap_fileargs.h>
+
#include "_elftc.h"
ELFTC_VCSID("$Id: nm.c 3504 2016-12-17 15:33:16Z kaiwang27 $");
@@ -165,6 +169,8 @@
fn_sym_print value_print_fn;
fn_sym_print size_print_fn;
+
+ fileargs_t *fileargs;
};
#define CHECK_SYM_PRINT_DATA(p) (p->headp == NULL || p->sh_num == 0 || \
@@ -177,9 +183,10 @@
static int cmp_none(const void *, const void *);
static int cmp_size(const void *, const void *);
static int cmp_value(const void *, const void *);
+static void enter_cap_mode(int, char **);
static void filter_dest(void);
static int filter_insert(fn_filter);
-static void get_opt(int, char **);
+static void get_opt(int *, char ***);
static int get_sym(Elf *, struct sym_head *, int, size_t, size_t,
const char *, const char **, int);
static const char * get_sym_name(Elf *, const GElf_Sym *, size_t,
@@ -392,6 +399,36 @@
return (l->sym->st_value - r->sym->st_value);
}
+static void
+enter_cap_mode(int argc, char **argv)
+{
+ cap_rights_t rights;
+ fileargs_t *fa;
+ char *defaultfn;
+
+ cap_rights_init(&rights, CAP_FSTAT, CAP_MMAP_R);
+
+ if (argc == 0) {
+ defaultfn = strdup(nm_info.def_filename);
+ if (defaultfn == NULL)
+ err(EXIT_FAILURE, "strdup");
+ argc = 1;
+ argv = &defaultfn;
+ }
+
+ fa = fileargs_init(argc, argv, O_RDONLY, 0, &rights, FA_OPEN);
+ if (fa == NULL)
+ err(EXIT_FAILURE, "failed to initialize fileargs");
+
+ caph_cache_catpages();
+ if (caph_limit_stdio() < 0)
+ err(EXIT_FAILURE, "failed to limit stdio rights");
+ if (caph_enter_casper() < 0)
+ err(EXIT_FAILURE, "failed to enter capability mode");
+
+ nm_opts.fileargs = fa;
+}
+
static void
filter_dest(void)
{
@@ -441,18 +478,18 @@
}
static void
-get_opt(int argc, char **argv)
+get_opt(int *argc, char ***argv)
{
int ch;
bool is_posix, oflag;
- if (argc <= 0 || argv == NULL)
+ if (*argc <= 0 || *argv == NULL)
return;
oflag = is_posix = false;
nm_opts.t = RADIX_HEX;
- while ((ch = getopt_long(argc, argv, "ABCDF:PSVaefghlnoprst:uvx",
- nm_longopts, NULL)) != -1) {
+ while ((ch = getopt_long(*argc, *argv, "ABCDF:PSVaefghlnoprst:uvx",
+ nm_longopts, NULL)) != -1) {
switch (ch) {
case 'A':
nm_opts.print_name = PRINT_NAME_FULL;
@@ -573,6 +610,8 @@
usage(1);
}
}
+ *argc -= optind;
+ *argv += optind;
/*
* In POSIX mode, the '-o' option controls the output radix.
@@ -764,6 +803,7 @@
nm_opts.elem_print_fn = &sym_elem_print_all;
nm_opts.value_print_fn = &sym_value_dec_print;
nm_opts.size_print_fn = &sym_size_dec_print;
+ nm_opts.fileargs = NULL;
SLIST_INIT(&nm_out_filter);
}
@@ -1467,7 +1507,7 @@
assert(filename != NULL && "filename is null");
- if ((fd = open(filename, O_RDONLY)) == -1) {
+ if ((fd = fileargs_open(nm_opts.fileargs, filename)) == -1) {
warn("'%s'", filename);
return (1);
}
@@ -2115,8 +2155,9 @@
int rtn;
global_init();
- get_opt(argc, argv);
- rtn = read_files(argc - optind, argv + optind);
+ get_opt(&argc, &argv);
+ enter_cap_mode(argc, argv);
+ rtn = read_files(argc, argv);
global_dest();
exit(rtn);
Index: usr.bin/nm/Makefile
===================================================================
--- usr.bin/nm/Makefile
+++ usr.bin/nm/Makefile
@@ -11,6 +11,12 @@
LIBADD= dwarf elftc elf
+.if ${MK_CASPER} != "no" && !defined(BOOTSTRAPPING) && !defined(NXB_TARGET)
+LIBADD+= casper
+LIBADD+= cap_fileargs
+CFLAGS+= -DWITH_CASPER
+.endif
+
CFLAGS+=-I${ELFTCDIR}/libelftc -I${ELFTCDIR}/common
.include <bsd.prog.mk>

File Metadata

Mime Type
text/plain
Expires
Mon, Aug 17, 9:20 PM (13 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36873553
Default Alt Text
D21107.id62761.diff (3 KB)

Event Timeline