Date: Thu, 1 Aug 2019 18:56:33 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r350515 - head/contrib/elftoolchain/addr2line Message-ID: <201908011856.x71IuXLj000641@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Thu Aug 1 18:56:32 2019 New Revision: 350515 URL: https://svnweb.freebsd.org/changeset/base/350515 Log: Capsicumize addr2line(1). Reviewed by: oshogbo Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D21104 Modified: head/contrib/elftoolchain/addr2line/addr2line.c Modified: head/contrib/elftoolchain/addr2line/addr2line.c ============================================================================== --- head/contrib/elftoolchain/addr2line/addr2line.c Thu Aug 1 18:51:18 2019 (r350514) +++ head/contrib/elftoolchain/addr2line/addr2line.c Thu Aug 1 18:56:32 2019 (r350515) @@ -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 int main(int argc, char **argv) { + cap_rights_t rights; Elf *e; Dwarf_Debug dbg; Dwarf_Error de; @@ -705,6 +708,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));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908011856.x71IuXLj000641>