aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2019-08-01 18:56:32 +0000
committerMark Johnston <markj@FreeBSD.org>2019-08-01 18:56:32 +0000
commit1d954fed61a0fd99ac40a401764b23e188610d4e (patch)
tree6200088c1ab96fc55b60384d7fea7ac647502e16 /contrib
parent9a9b8e469325a7157d2714d150798acec1aadd1a (diff)
downloadsrc-1d954fed61a0fd99ac40a401764b23e188610d4e.tar.gz
src-1d954fed61a0fd99ac40a401764b23e188610d4e.zip
Capsicumize addr2line(1).
Reviewed by: oshogbo Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D21104
Notes
Notes: svn path=/head/; revision=350515
Diffstat (limited to 'contrib')
-rw-r--r--contrib/elftoolchain/addr2line/addr2line.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/contrib/elftoolchain/addr2line/addr2line.c b/contrib/elftoolchain/addr2line/addr2line.c
index 619214fb0fae..24ece6c11f57 100644
--- a/contrib/elftoolchain/addr2line/addr2line.c
+++ b/contrib/elftoolchain/addr2line/addr2line.c
@@ -25,6 +25,8 @@
*/
#include <sys/param.h>
+
+#include <capsicum_helpers.h>
#include <dwarf.h>
#include <err.h>
#include <fcntl.h>
@@ -649,6 +651,7 @@ find_section_base(const char *exe, Elf *e, const char *section)
int
main(int argc, char **argv)
{
+ cap_rights_t rights;
Elf *e;
Dwarf_Debug dbg;
Dwarf_Error de;
@@ -706,6 +709,16 @@ main(int argc, char **argv)
if ((fd = open(exe, O_RDONLY)) < 0)
err(EXIT_FAILURE, "%s", exe);
+ if (caph_rights_limit(fd, cap_rights_init(&rights, CAP_FSTAT,
+ CAP_MMAP_R)) < 0)
+ errx(EXIT_FAILURE, "caph_rights_limit");
+
+ caph_cache_catpages();
+ if (caph_limit_stdio() < 0)
+ errx(EXIT_FAILURE, "failed to limit stdio rights");
+ if (caph_enter() < 0)
+ errx(EXIT_FAILURE, "failed to enter capability mode");
+
if (dwarf_init(fd, DW_DLC_READ, NULL, NULL, &dbg, &de))
errx(EXIT_FAILURE, "dwarf_init: %s", dwarf_errmsg(de));