summaryrefslogtreecommitdiffstats
path: root/usr.sbin/traceroute
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2019-08-28 20:03:51 +0000
committerderaadt <deraadt@openbsd.org>2019-08-28 20:03:51 +0000
commit115bfdf815fc2d6ff8ac45f24842ac7a4ee03de4 (patch)
treef0e1792a27b209c0b6451089e8c086a38707a08c /usr.sbin/traceroute
parentRecast "SCSISPC() != 2" into "!SCSI2() || SCSI3()", i.e. "!= 2" into (diff)
downloadwireguard-openbsd-115bfdf815fc2d6ff8ac45f24842ac7a4ee03de4.tar.xz
wireguard-openbsd-115bfdf815fc2d6ff8ac45f24842ac7a4ee03de4.zip
At startup, unveil entire filesystem to read-only. If after privdrop, some
implausible bug existed in the socket setup (mostly dns-related and setsockopt) it would be largely neutered. of course, a very restrictive pledge is installed soon after that... ok mestre brynet florian
Diffstat (limited to 'usr.sbin/traceroute')
-rw-r--r--usr.sbin/traceroute/traceroute.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/usr.sbin/traceroute/traceroute.c b/usr.sbin/traceroute/traceroute.c
index b120620528f..d079e91b4f5 100644
--- a/usr.sbin/traceroute/traceroute.c
+++ b/usr.sbin/traceroute/traceroute.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: traceroute.c,v 1.161 2019/06/28 13:32:51 deraadt Exp $ */
+/* $OpenBSD: traceroute.c,v 1.162 2019/08/28 20:03:51 deraadt Exp $ */
/* $NetBSD: traceroute.c,v 1.10 1995/05/21 15:50:45 mycroft Exp $ */
/*
@@ -327,6 +327,12 @@ main(int argc, char *argv[])
uid_t ouid, uid;
gid_t gid;
+ /* Cannot pledge due to special setsockopt()s below */
+ if (unveil("/", "r") == -1)
+ err(1, "unveil");
+ if (unveil(NULL, NULL) == -1)
+ err(1, "unveil");
+
if ((conf = calloc(1, sizeof(*conf))) == NULL)
err(1,NULL);