From b077df94ddcf1dce33cfeb10e5197051322be330 Mon Sep 17 00:00:00 2001
From: markj <markj@FreeBSD.org>
Date: Thu, 1 Aug 2019 18:56:32 +0000
Subject: [PATCH] Capsicumize addr2line(1).

Reviewed by:	oshogbo
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D21104
---
 contrib/elftoolchain/addr2line/addr2line.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/contrib/elftoolchain/addr2line/addr2line.c b/contrib/elftoolchain/addr2line/addr2line.c
index 619214fb0fa..24ece6c11f5 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));
 
-- 
2.45.0