Original thread and discussion here:
https://marc.info/?l=openbsd-tech&m=162000231914017&w=2
I started this a couple of months ago but realized I never actually
finished this and submitted the full diff. So here it is, for whole
src tree.
I've run this through a `make build` here locally to ensure it builds -
there's no behavioral changes anywhere, only the formatting of the error
strings. Hopefully I've not missed any.
If it's preferred for me to break the patch up into smaller pieces,
that's fine - just let me know. I figured it's probably fine to apply
all at once since it's related but I could be wrong.
Perhaps another question is whether it's worth documenting this
convention somewhere - if that's of interest also I'm happy to take a
stab at that.
Index: bin/ps/ps.c
===================================================================
RCS file: /cvs/src/bin/ps/ps.c,v
retrieving revision 1.76
diff -u -p -u -p -r1.76 ps.c
--- bin/ps/ps.c 16 Dec 2019 19:21:16 -0000 1.76
+++ bin/ps/ps.c 2 Jul 2021 20:40:08 -0000
@@ -276,18 +276,18 @@ main(int argc, char *argv[])
errx(1, "%s", errbuf);
if (unveil(_PATH_DEVDB, "r") == -1 && errno != ENOENT)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_DEVDB);
if (unveil(_PATH_DEV, "r") == -1 && errno != ENOENT)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_DEV);
if (swapf)
if (unveil(swapf, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", swapf);
if (nlistf)
if (unveil(nlistf, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", nlistf);
if (memf)
if (unveil(memf, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", memf);
if (pledge("stdio rpath getpw ps", NULL) == -1)
err(1, "pledge");
Index: games/tetris/tetris.c
===================================================================
RCS file: /cvs/src/games/tetris/tetris.c,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 tetris.c
--- games/tetris/tetris.c 18 May 2019 19:38:25 -0000 1.34
+++ games/tetris/tetris.c 2 Jul 2021 20:40:09 -0000
@@ -234,7 +234,7 @@ main(int argc, char *argv[])
scr_init();
if (unveil(scorepath, "rwc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", scorepath);
if (pledge("stdio rpath wpath cpath tty", NULL) == -1)
err(1, "pledge");
Index: libexec/comsat/comsat.c
===================================================================
RCS file: /cvs/src/libexec/comsat/comsat.c,v
retrieving revision 1.49
diff -u -p -u -p -r1.49 comsat.c
--- libexec/comsat/comsat.c 24 Sep 2018 22:56:54 -0000 1.49
+++ libexec/comsat/comsat.c 2 Jul 2021 20:40:17 -0000
@@ -92,13 +92,13 @@ main(int argc, char *argv[])
}
if (unveil(_PATH_MAILDIR, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_MAILDIR);
if (unveil(_PATH_UTMP, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_UTMP);
if (unveil("/tmp", "w") == -1)
- err(1, "unveil");
+ err(1, "unveil /tmp");
if (unveil(_PATH_DEV, "rw") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_DEV);
if (pledge("stdio rpath wpath proc tty", NULL) == -1)
err(1, "pledge");
Index: libexec/fingerd/fingerd.c
===================================================================
RCS file: /cvs/src/libexec/fingerd/fingerd.c,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 fingerd.c
--- libexec/fingerd/fingerd.c 28 Jun 2019 13:32:53 -0000 1.41
+++ libexec/fingerd/fingerd.c 2 Jul 2021 20:40:17 -0000
@@ -109,7 +109,7 @@ main(int argc, char *argv[])
}
if (unveil(prog, "x") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", prog);
if (pledge("stdio inet dns proc exec", NULL) == -1)
err(1, "pledge");
Index: libexec/lockspool/lockspool.c
===================================================================
RCS file: /cvs/src/libexec/lockspool/lockspool.c,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 lockspool.c
--- libexec/lockspool/lockspool.c 9 Feb 2020 14:59:20 -0000 1.21
+++ libexec/lockspool/lockspool.c 2 Jul 2021 20:40:17 -0000
@@ -54,7 +54,7 @@ main(int argc, char *argv[])
int holdfd;
if (unveil(_PATH_MAILDIR, "rwc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_MAILDIR);
if (pledge("stdio rpath wpath getpw cpath fattr", NULL) == -1)
err(1, "pledge");
Index: libexec/spamlogd/spamlogd.c
===================================================================
RCS file: /cvs/src/libexec/spamlogd/spamlogd.c,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 spamlogd.c
--- libexec/spamlogd/spamlogd.c 25 Jul 2019 17:32:33 -0000 1.31
+++ libexec/spamlogd/spamlogd.c 2 Jul 2021 20:40:17 -0000
@@ -463,7 +463,7 @@ main(int argc, char **argv)
}
if (unveil(PATH_SPAMD_DB, "rw") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", PATH_SPAMD_DB);
if (syncsend) {
if (pledge("stdio rpath wpath inet flock", NULL) == -1)
err(1, "pledge");
Index: regress/sbin/ifconfig/ifaddr.c
===================================================================
RCS file: /cvs/src/regress/sbin/ifconfig/ifaddr.c,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 ifaddr.c
--- regress/sbin/ifconfig/ifaddr.c 12 Mar 2021 19:35:43 -0000 1.5
+++ regress/sbin/ifconfig/ifaddr.c 2 Jul 2021 20:40:18 -0000
@@ -287,7 +287,7 @@ main(int argc, char *argv[])
if (argc < 2) {
/* no filesystem visibility */
if (unveil("/", "") == -1)
- err(1, "unveil");
+ err(1, "unveil /");
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
aflag = 1;
@@ -326,11 +326,11 @@ main(int argc, char *argv[])
argc--, argv++;
if (unveil(_PATH_RESCONF, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_RESCONF);
if (unveil(_PATH_HOSTS, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_HOSTS);
if (unveil(_PATH_SERVICES, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_SERVICES);
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
Index: regress/usr.bin/lastcomm/unveil.c
===================================================================
RCS file: /cvs/src/regress/usr.bin/lastcomm/unveil.c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 unveil.c
--- regress/usr.bin/lastcomm/unveil.c 27 Jul 2020 13:40:02 -0000 1.1
+++ regress/usr.bin/lastcomm/unveil.c 2 Jul 2021 20:40:19 -0000
@@ -22,7 +22,7 @@ int
main(int argc, char *argv[])
{
if (unveil("/tmp", "r") == -1)
- err(1, "unveil");
+ err(1, "unveil /tmp");
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
Index: sbin/dhclient/dhclient.c
===================================================================
RCS file: /cvs/src/sbin/dhclient/dhclient.c,v
retrieving revision 1.722
diff -u -p -u -p -r1.722 dhclient.c
--- sbin/dhclient/dhclient.c 2 May 2021 19:16:48 -0000 1.722
+++ sbin/dhclient/dhclient.c 2 Jul 2021 20:40:19 -0000
@@ -2334,9 +2334,9 @@ fork_privchld(struct interface_info *ifi
fatal("socket(AF_ROUTE, SOCK_RAW)");
if (unveil(_PATH_RESCONF, "wc") == -1)
- fatal("unveil");
+ fatal("unveil %s", _PATH_RESCONF);
if (unveil("/etc/resolv.conf.tail", "r") == -1)
- fatal("unveil");
+ fatal("unveil /etc/resolve.conf.tail");
if (unveil(NULL, NULL) == -1)
fatal("unveil");
Index: sbin/dhcpleased/dhcpleased.c
===================================================================
RCS file: /cvs/src/sbin/dhcpleased/dhcpleased.c,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 dhcpleased.c
--- sbin/dhcpleased/dhcpleased.c 20 Jun 2021 08:31:45 -0000 1.13
+++ sbin/dhcpleased/dhcpleased.c 2 Jul 2021 20:40:19 -0000
@@ -274,7 +274,7 @@ main(int argc, char *argv[])
}
if (unveil(NULL, NULL) == -1)
- fatal("locking unveil");
+ fatal("unveil");
#if notyet
if (pledge("stdio inet rpath wpath sendfd wroute bpf", NULL) == -1)
fatal("pledge");
Index: sbin/dhcpleased/engine.c
===================================================================
RCS file: /cvs/src/sbin/dhcpleased/engine.c,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 engine.c
--- sbin/dhcpleased/engine.c 20 Jun 2021 08:31:45 -0000 1.17
+++ sbin/dhcpleased/engine.c 2 Jul 2021 20:40:19 -0000
@@ -182,9 +182,9 @@ engine(int debug, int verbose)
fatal("chdir(\"/\")");
if (unveil("/", "") == -1)
- fatal("unveil(\"/\", \"\")");
+ fatal("unveil /");
if (unveil(NULL, NULL) == -1)
- fatal("unveil(NULL, NULL)");
+ fatal("unveil");
setproctitle("%s", "engine");
log_procinit("engine");
Index: sbin/dhcpleased/frontend.c
===================================================================
RCS file: /cvs/src/sbin/dhcpleased/frontend.c,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 frontend.c
--- sbin/dhcpleased/frontend.c 16 Jun 2021 14:08:38 -0000 1.12
+++ sbin/dhcpleased/frontend.c 2 Jul 2021 20:40:19 -0000
@@ -138,9 +138,9 @@ frontend(int debug, int verbose)
fatal("chdir(\"/\")");
if (unveil("/", "") == -1)
- fatal("unveil(\"/\", \"\")");
+ fatal("unveil /");
if (unveil(NULL, NULL) == -1)
- fatal("unveil(NULL, NULL)");
+ fatal("unveil");
setproctitle("%s", "frontend");
log_procinit("frontend");
Index: sbin/fsck/fsck.c
===================================================================
RCS file: /cvs/src/sbin/fsck/fsck.c,v
retrieving revision 1.40
diff -u -p -u -p -r1.40 fsck.c
--- sbin/fsck/fsck.c 28 Jun 2019 13:32:43 -0000 1.40
+++ sbin/fsck/fsck.c 2 Jul 2021 20:40:19 -0000
@@ -110,11 +110,11 @@ main(int argc, char *argv[])
checkroot();
if (unveil("/dev", "rw") == -1)
- err(1, "unveil");
+ err(1, "unveil /dev");
if (unveil(_PATH_FSTAB, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_FSTAB);
if (unveil("/sbin", "x") == -1)
- err(1, "unveil");
+ err(1, "unveil /sbin");
if (pledge("stdio rpath wpath disklabel proc exec", NULL) == -1)
err(1, "pledge");
Index: sbin/fsck_ffs/setup.c
===================================================================
RCS file: /cvs/src/sbin/fsck_ffs/setup.c,v
retrieving revision 1.67
diff -u -p -u -p -r1.67 setup.c
--- sbin/fsck_ffs/setup.c 20 Jun 2020 07:49:04 -0000 1.67
+++ sbin/fsck_ffs/setup.c 2 Jul 2021 20:40:19 -0000
@@ -105,7 +105,7 @@ setup(char *dev, int isfsdb)
if (isfsdb || !hotroot()) {
if (unveil("/dev", "rw") == -1)
- err(1, "unveil");
+ err(1, "unveil /dev");
if (pledge("stdio rpath wpath getpw tty disklabel",
NULL) == -1)
err(1, "pledge");
Index: sbin/fsck_msdos/check.c
===================================================================
RCS file: /cvs/src/sbin/fsck_msdos/check.c,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 check.c
--- sbin/fsck_msdos/check.c 28 Jun 2019 13:32:43 -0000 1.20
+++ sbin/fsck_msdos/check.c 2 Jul 2021 20:40:19 -0000
@@ -55,7 +55,7 @@ checkfilesys(const char *fname)
int mod = 0;
if (unveil("/dev", "rw") == -1)
- err(1, "unveil");
+ err(1, "unveil /dev");
rdonly = alwaysno;
Index: sbin/ifconfig/ifconfig.c
===================================================================
RCS file: /cvs/src/sbin/ifconfig/ifconfig.c,v
retrieving revision 1.442
diff -u -p -u -p -r1.442 ifconfig.c
--- sbin/ifconfig/ifconfig.c 20 Mar 2021 17:11:49 -0000 1.442
+++ sbin/ifconfig/ifconfig.c 2 Jul 2021 20:40:19 -0000
@@ -773,7 +773,7 @@ main(int argc, char *argv[])
if (argc < 2) {
/* no filesystem visibility */
if (unveil("/", "") == -1)
- err(1, "unveil");
+ err(1, "unveil /");
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
aflag = 1;
@@ -827,11 +827,11 @@ main(int argc, char *argv[])
if (!found_rulefile) {
if (unveil(_PATH_RESCONF, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_RESCONF);
if (unveil(_PATH_HOSTS, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_HOSTS);
if (unveil(_PATH_SERVICES, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_SERVICES);
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
}
Index: sbin/nologin/nologin.c
===================================================================
RCS file: /cvs/src/sbin/nologin/nologin.c,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 nologin.c
--- sbin/nologin/nologin.c 28 Jun 2019 13:32:45 -0000 1.8
+++ sbin/nologin/nologin.c 2 Jul 2021 20:40:20 -0000
@@ -47,7 +47,7 @@ main(int argc, char *argv[])
char nbuf[BUFSIZ];
if (unveil(_PATH_NOLOGIN_TXT, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_NOLOGIN_TXT);
if (pledge("stdio rpath", NULL) == -1)
err(1, "pledge");
Index: sbin/pflogd/privsep.c
===================================================================
RCS file: /cvs/src/sbin/pflogd/privsep.c,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 privsep.c
--- sbin/pflogd/privsep.c 27 Nov 2019 17:49:09 -0000 1.34
+++ sbin/pflogd/privsep.c 2 Jul 2021 20:40:20 -0000
@@ -134,15 +134,15 @@ priv_init(int Pflag, int argc, char *arg
setproctitle("[priv]");
if (unveil(_PATH_RESCONF, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_RESCONF);
if (unveil(_PATH_HOSTS, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_HOSTS);
if (unveil(_PATH_SERVICES, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_SERVICES);
if (unveil("/dev/bpf", "r") == -1)
- err(1, "unveil");
+ err(1, "unveil /dev/bpf");
if (unveil(filename, "rwc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", filename);
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
Index: sbin/ping/ping.c
===================================================================
RCS file: /cvs/src/sbin/ping/ping.c,v
retrieving revision 1.244
diff -u -p -u -p -r1.244 ping.c
--- sbin/ping/ping.c 21 Feb 2021 10:38:42 -0000 1.244
+++ sbin/ping/ping.c 2 Jul 2021 20:40:20 -0000
@@ -266,7 +266,7 @@ main(int argc, char *argv[])
/* Cannot pledge due to special setsockopt()s below */
if (unveil("/", "r") == -1)
- err(1, "unveil");
+ err(1, "unveil /");
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
Index: sbin/shutdown/shutdown.c
===================================================================
RCS file: /cvs/src/sbin/shutdown/shutdown.c,v
retrieving revision 1.52
diff -u -p -u -p -r1.52 shutdown.c
--- sbin/shutdown/shutdown.c 3 Aug 2018 17:09:22 -0000 1.52
+++ sbin/shutdown/shutdown.c 2 Jul 2021 20:40:20 -0000
@@ -166,24 +166,24 @@ main(int argc, char *argv[])
}
if (unveil(_PATH_CONSOLE, "rw") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_CONSOLE);
if (unveil(_PATH_RC, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_RC);
if (unveil(_PATH_WALL, "x") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_WALL);
if (unveil(_PATH_FASTBOOT, "wc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_FASTBOOT);
if (unveil(_PATH_NOLOGIN, "wc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_NOLOGIN);
if (dohalt || dopower) {
if (unveil(_PATH_HALT, "x") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_HALT);
} else if (doreboot) {
if (unveil(_PATH_REBOOT, "x") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_REBOOT);
} else {
if (unveil(_PATH_BSHELL, "x") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_BSHELL);
}
if (pledge("stdio rpath wpath cpath getpw tty id proc exec", NULL) == -1)
err(1, "pledge");
Index: sbin/slaacd/engine.c
===================================================================
RCS file: /cvs/src/sbin/slaacd/engine.c,v
retrieving revision 1.72
diff -u -p -u -p -r1.72 engine.c
--- sbin/slaacd/engine.c 1 May 2021 11:53:06 -0000 1.72
+++ sbin/slaacd/engine.c 2 Jul 2021 20:40:20 -0000
@@ -368,9 +368,9 @@ engine(int debug, int verbose)
fatal("chdir(\"/\")");
if (unveil("/", "") == -1)
- fatal("unveil(\"/\", \"\")");
+ fatal("unveil /");
if (unveil(NULL, NULL) == -1)
- fatal("unveil(NULL, NULL)");
+ fatal("unveil");
setproctitle("%s", "engine");
log_procinit("engine");
Index: sbin/slaacd/frontend.c
===================================================================
RCS file: /cvs/src/sbin/slaacd/frontend.c,v
retrieving revision 1.56
diff -u -p -u -p -r1.56 frontend.c
--- sbin/slaacd/frontend.c 1 May 2021 11:53:06 -0000 1.56
+++ sbin/slaacd/frontend.c 2 Jul 2021 20:40:20 -0000
@@ -149,9 +149,9 @@ frontend(int debug, int verbose)
fatal("chdir(\"/\")");
if (unveil("/", "") == -1)
- fatal("unveil(\"/\", \"\")");
+ fatal("unveil /");
if (unveil(NULL, NULL) == -1)
- fatal("unveil(NULL, NULL)");
+ fatal("unveil");
setproctitle("%s", "frontend");
log_procinit("frontend");
Index: sbin/sysctl/sysctl.c
===================================================================
RCS file: /cvs/src/sbin/sysctl/sysctl.c,v
retrieving revision 1.257
diff -u -p -u -p -r1.257 sysctl.c
--- sbin/sysctl/sysctl.c 18 May 2021 05:25:40 -0000 1.257
+++ sbin/sysctl/sysctl.c 2 Jul 2021 20:40:20 -0000
@@ -265,9 +265,9 @@ main(int argc, char *argv[])
ctime(&boottime); /* satisfy potential $TZ expansion before unveil() */
if (unveil(_PATH_DEVDB, "r") == -1 && errno != ENOENT)
- err(1,"unveil");
+ err(1,"unveil %s", _PATH_DEVDB);
if (unveil("/dev", "r") == -1 && errno != ENOENT)
- err(1, "unveil");
+ err(1, "unveil /dev");
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
Index: sbin/unwind/resolver.c
===================================================================
RCS file: /cvs/src/sbin/unwind/resolver.c,v
retrieving revision 1.143
diff -u -p -u -p -r1.143 resolver.c
--- sbin/unwind/resolver.c 7 Feb 2021 13:35:41 -0000 1.143
+++ sbin/unwind/resolver.c 2 Jul 2021 20:40:20 -0000
@@ -377,7 +377,7 @@ resolver(int debug, int verbose)
fatal("can't drop privileges");
if (unveil(TLS_DEFAULT_CA_CERT_FILE, "r") == -1)
- fatal("unveil");
+ fatal("unveil %s", TLS_DEFAULT_CA_CERT_FILE);
if (pledge("stdio inet dns rpath recvfd", NULL) == -1)
fatal("pledge");
Index: usr.bin/audioctl/audioctl.c
===================================================================
RCS file: /cvs/src/usr.bin/audioctl/audioctl.c,v
retrieving revision 1.42
diff -u -p -u -p -r1.42 audioctl.c
--- usr.bin/audioctl/audioctl.c 2 Feb 2020 05:25:41 -0000 1.42
+++ usr.bin/audioctl/audioctl.c 2 Jul 2021 20:40:21 -0000
@@ -285,7 +285,7 @@ main(int argc, char **argv)
argv += optind;
if (unveil(path, "w") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", path);
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
@@ -296,5 +296,5 @@ main(int argc, char **argv)
audio_main(argc, argv);
close(fd);
- return 0;
+ return 0;
}
Index: usr.bin/biff/biff.c
===================================================================
RCS file: /cvs/src/usr.bin/biff/biff.c,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 biff.c
--- usr.bin/biff/biff.c 28 Jun 2019 13:35:00 -0000 1.17
+++ usr.bin/biff/biff.c 2 Jul 2021 20:40:21 -0000
@@ -62,7 +62,7 @@ main(int argc, char *argv[])
err(2, "tty");
if (unveil(name, "rw") == -1)
- err(2, "unveil");
+ err(2, "unveil %s", name);
if (pledge("stdio rpath fattr", NULL) == -1)
err(2, "pledge");
Index: usr.bin/chpass/chpass.c
===================================================================
RCS file: /cvs/src/usr.bin/chpass/chpass.c,v
retrieving revision 1.46
diff -u -p -u -p -r1.46 chpass.c
--- usr.bin/chpass/chpass.c 14 Sep 2019 17:47:00 -0000 1.46
+++ usr.bin/chpass/chpass.c 2 Jul 2021 20:40:21 -0000
@@ -137,11 +137,11 @@ main(int argc, char *argv[])
display(tempname, dfd, pw);
if (unveil(_PATH_BSHELL, "x") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_BSHELL);
if (unveil(_PATH_SHELLS, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_SHELLS);
if (unveil(tempname, "rc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", tempname);
if (pledge("stdio rpath wpath cpath id proc exec unveil",
NULL) == -1)
err(1, "pledge");
@@ -165,7 +165,7 @@ main(int argc, char *argv[])
if (op == NEWSH) {
if (unveil(_PATH_SHELLS, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_SHELLS);
if (pledge("stdio rpath wpath cpath id proc exec unveil",
NULL) == -1)
err(1, "pledge");
@@ -184,11 +184,11 @@ main(int argc, char *argv[])
sigprocmask(SIG_BLOCK, &fullset, NULL);
if (unveil(_PATH_MASTERPASSWD_LOCK, "rwc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_MASTERPASSWD_LOCK);
if (unveil(_PATH_MASTERPASSWD, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_MASTERPASSWD);
if (unveil(_PATH_PWD_MKDB, "x") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_PWD_MKDB);
if (pledge("stdio rpath wpath cpath proc exec", NULL) == -1)
err(1, "pledge");
Index: usr.bin/ctfconv/ctfconv.c
===================================================================
RCS file: /cvs/src/usr.bin/ctfconv/ctfconv.c,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 ctfconv.c
--- usr.bin/ctfconv/ctfconv.c 7 Nov 2019 13:39:08 -0000 1.18
+++ usr.bin/ctfconv/ctfconv.c 2 Jul 2021 20:40:21 -0000
@@ -128,11 +128,11 @@ main(int argc, char *argv[])
filename = *argv;
if (unveil(filename, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", filename);
if (outfile != NULL) {
if (unveil(outfile, "wc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", outfile);
}
if (pledge("stdio rpath wpath cpath", NULL) == -1)
Index: usr.bin/doas/doas.c
===================================================================
RCS file: /cvs/src/usr.bin/doas/doas.c,v
retrieving revision 1.89
diff -u -p -u -p -r1.89 doas.c
--- usr.bin/doas/doas.c 27 Jan 2021 17:02:50 -0000 1.89
+++ usr.bin/doas/doas.c 2 Jul 2021 20:40:21 -0000
@@ -416,9 +416,10 @@ main(int argc, char **argv)
if (formerpath == NULL)
formerpath = "";
- if (unveil(_PATH_LOGIN_CONF, "r") == -1 ||
- unveil(_PATH_LOGIN_CONF ".db", "r") == -1)
- err(1, "unveil");
+ if (unveil(_PATH_LOGIN_CONF, "r") == -1)
+ err(1, "unveil %s", _PATH_LOGIN_CONF);
+ if (unveil(_PATH_LOGIN_CONF ".db", "r") == -1)
+ err(1, "unveil %s.db", _PATH_LOGIN_CONF);
if (rule->cmd) {
if (setenv("PATH", safepath, 1) == -1)
err(1, "failed to set PATH '%s'", safepath);
Index: usr.bin/encrypt/encrypt.c
===================================================================
RCS file: /cvs/src/usr.bin/encrypt/encrypt.c,v
retrieving revision 1.50
diff -u -p -u -p -r1.50 encrypt.c
--- usr.bin/encrypt/encrypt.c 14 Sep 2019 17:47:00 -0000 1.50
+++ usr.bin/encrypt/encrypt.c 2 Jul 2021 20:40:21 -0000
@@ -95,9 +95,10 @@ main(int argc, char **argv)
char *extra = NULL; /* Store login class or number of rounds */
const char *errstr;
- if (unveil(_PATH_LOGIN_CONF, "r") == -1 ||
- unveil(_PATH_LOGIN_CONF ".db", "r") == -1)
- err(1, "unveil");
+ if (unveil(_PATH_LOGIN_CONF, "r") == -1)
+ err(1, "unveil %s", _PATH_LOGIN_CONF);
+ if (unveil(_PATH_LOGIN_CONF ".db", "r") == -1)
+ err(1, "unveil %s.db", _PATH_LOGIN_CONF);
if (pledge("stdio rpath tty", NULL) == -1)
err(1, "pledge");
Index: usr.bin/from/from.c
===================================================================
RCS file: /cvs/src/usr.bin/from/from.c,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 from.c
--- usr.bin/from/from.c 29 May 2020 07:16:50 -0000 1.27
+++ usr.bin/from/from.c 2 Jul 2021 20:40:21 -0000
@@ -80,7 +80,7 @@ main(int argc, char *argv[])
file = mail_spool(file, *argv);
if (unveil(file, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", file);
if (pledge("stdio rpath", NULL) == -1)
err(1, "pledge");
Index: usr.bin/getconf/getconf.c
===================================================================
RCS file: /cvs/src/usr.bin/getconf/getconf.c,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 getconf.c
--- usr.bin/getconf/getconf.c 26 Oct 2018 17:11:32 -0000 1.20
+++ usr.bin/getconf/getconf.c 2 Jul 2021 20:40:21 -0000
@@ -514,7 +514,7 @@ main(int argc, char *argv[])
case PATHCONF:
if (unveil(argv[1], "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", argv[1]);
if (pledge("stdio rpath", NULL) == -1)
err(1, "pledge");
errno = 0;
Index: usr.bin/getent/getent.c
===================================================================
RCS file: /cvs/src/usr.bin/getent/getent.c,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 getent.c
--- usr.bin/getent/getent.c 2 Nov 2018 10:21:29 -0000 1.21
+++ usr.bin/getent/getent.c 2 Jul 2021 20:40:21 -0000
@@ -102,7 +102,7 @@ main(int argc, char *argv[])
if (strcmp(curdb->name, argv[1]) == 0) {
if (curdb->unveil != NULL) {
if (unveil(curdb->unveil, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", curdb->unveil);
}
if (pledge(curdb->pledge, NULL) == -1)
err(1, "pledge");
Index: usr.bin/htpasswd/htpasswd.c
===================================================================
RCS file: /cvs/src/usr.bin/htpasswd/htpasswd.c,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 htpasswd.c
--- usr.bin/htpasswd/htpasswd.c 31 Oct 2018 07:39:10 -0000 1.17
+++ usr.bin/htpasswd/htpasswd.c 2 Jul 2021 20:40:21 -0000
@@ -74,9 +74,9 @@ main(int argc, char** argv)
if ((batch && argc == 1) || (!batch && argc == 2)) {
if (unveil(argv[0], "rwc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", argv[0]);
if (unveil("/tmp", "rwc") == -1)
- err(1, "unveil");
+ err(1, "unveil /tmp");
}
if (pledge("stdio rpath wpath cpath flock tmppath tty", NULL) == -1)
err(1, "pledge");
Index: usr.bin/kdump/kdump.c
===================================================================
RCS file: /cvs/src/usr.bin/kdump/kdump.c,v
retrieving revision 1.143
diff -u -p -u -p -r1.143 kdump.c
--- usr.bin/kdump/kdump.c 5 Apr 2020 08:32:14 -0000 1.143
+++ usr.bin/kdump/kdump.c 2 Jul 2021 20:40:21 -0000
@@ -223,9 +223,9 @@ main(int argc, char *argv[])
if (strcmp(tracefile, "-") != 0)
if (unveil(tracefile, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", tracefile);
if (unveil(_PATH_PROTOCOLS, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_PROTOCOLS);
if (pledge("stdio rpath getpw", NULL) == -1)
err(1, "pledge");
Index: usr.bin/last/last.c
===================================================================
RCS file: /cvs/src/usr.bin/last/last.c,v
retrieving revision 1.52
diff -u -p -u -p -r1.52 last.c
--- usr.bin/last/last.c 28 Jun 2019 13:35:01 -0000 1.52
+++ usr.bin/last/last.c 2 Jul 2021 20:40:21 -0000
@@ -153,7 +153,7 @@ main(int argc, char *argv[])
exit(0);
if (unveil(file, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", file);
if (pledge("stdio rpath", NULL) == -1)
err(1, "pledge");
Index: usr.bin/look/look.c
===================================================================
RCS file: /cvs/src/usr.bin/look/look.c,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 look.c
--- usr.bin/look/look.c 28 Jun 2019 13:35:01 -0000 1.23
+++ usr.bin/look/look.c 2 Jul 2021 20:40:21 -0000
@@ -111,7 +111,7 @@ main(int argc, char *argv[])
}
if (unveil(file, "r") == -1)
- err(2, "unveil");
+ err(2, "unveil %s", file);
if (pledge("stdio rpath", NULL) == -1)
err(2, "pledge");
Index: usr.bin/mesg/mesg.c
===================================================================
RCS file: /cvs/src/usr.bin/mesg/mesg.c,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 mesg.c
--- usr.bin/mesg/mesg.c 28 Jun 2019 13:35:02 -0000 1.16
+++ usr.bin/mesg/mesg.c 2 Jul 2021 20:40:21 -0000
@@ -65,7 +65,7 @@ main(int argc, char *argv[])
err(2, "ttyname");
if (unveil(tty, "rw") == -1)
- err(2, "unveil");
+ err(2, "unveil %s", tty);
if (pledge("stdio rpath fattr", NULL) == -1)
err(2, "pledge");
Index: usr.bin/mixerctl/mixerctl.c
===================================================================
RCS file: /cvs/src/usr.bin/mixerctl/mixerctl.c,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 mixerctl.c
--- usr.bin/mixerctl/mixerctl.c 4 Apr 2020 08:43:08 -0000 1.33
+++ usr.bin/mixerctl/mixerctl.c 2 Jul 2021 20:40:21 -0000
@@ -285,7 +285,7 @@ main(int argc, char **argv)
aflag = 1;
if (unveil(file, "w") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", file);
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
Index: usr.bin/nc/netcat.c
===================================================================
RCS file: /cvs/src/usr.bin/nc/netcat.c,v
retrieving revision 1.217
diff -u -p -u -p -r1.217 netcat.c
--- usr.bin/nc/netcat.c 12 Feb 2020 14:46:36 -0000 1.217
+++ usr.bin/nc/netcat.c 2 Jul 2021 20:40:21 -0000
@@ -364,13 +364,13 @@ main(int argc, char *argv[])
if (usetls) {
if (Cflag && unveil(Cflag, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", Cflag);
if (unveil(Rflag, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", Rflag);
if (Kflag && unveil(Kflag, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", Kflag);
if (oflag && unveil(oflag, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", oflag);
} else if (family == AF_UNIX && uflag && lflag && !kflag) {
/*
* After recvfrom(2) from client, the server connects
@@ -380,20 +380,20 @@ main(int argc, char *argv[])
} else {
if (family == AF_UNIX) {
if (unveil(host, "rwc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", host);
if (uflag && !kflag) {
if (sflag) {
if (unveil(sflag, "rwc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", sflag);
} else {
if (unveil("/tmp", "rwc") == -1)
- err(1, "unveil");
+ err(1, "unveil /tmp");
}
}
} else {
/* no filesystem visibility */
if (unveil("/", "") == -1)
- err(1, "unveil");
+ err(1, "unveil /");
}
}
Index: usr.bin/passwd/local_passwd.c
===================================================================
RCS file: /cvs/src/usr.bin/passwd/local_passwd.c,v
retrieving revision 1.58
diff -u -p -u -p -r1.58 local_passwd.c
--- usr.bin/passwd/local_passwd.c 24 Oct 2019 12:56:40 -0000 1.58
+++ usr.bin/passwd/local_passwd.c 2 Jul 2021 20:40:21 -0000
@@ -73,19 +73,19 @@ local_passwd(char *uname, int authentica
}
if (unveil(_PATH_MASTERPASSWD_LOCK, "rwc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_MASTERPASSWD_LOCK);
if (unveil(_PATH_MASTERPASSWD, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_MASTERPASSWD);
if (unveil(_PATH_LOGIN_CONF, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_LOGIN_CONF);
if (unveil(_PATH_LOGIN_CONF ".db", "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s.db", _PATH_LOGIN_CONF);
if (unveil(_PATH_BSHELL, "x") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_BSHELL);
if (unveil(_PATH_SHELLS, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_SHELLS);
if (unveil(_PATH_PWD_MKDB, "x") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_PWD_MKDB);
if (pledge("stdio rpath wpath cpath getpw tty id proc exec", NULL) == -1)
err(1, "pledge");
Index: usr.bin/sdiff/sdiff.c
===================================================================
RCS file: /cvs/src/usr.bin/sdiff/sdiff.c,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 sdiff.c
--- usr.bin/sdiff/sdiff.c 28 Sep 2018 18:21:52 -0000 1.37
+++ usr.bin/sdiff/sdiff.c 2 Jul 2021 20:40:21 -0000
@@ -255,7 +255,7 @@ main(int argc, char **argv)
if (outfile && (outfp = fopen(outfile, "w")) == NULL)
err(2, "could not open: %s", optarg);
- if ((tmpdir = getenv("TMPDIR")) == NULL || *tmpdir == '\0')
+ if ((tmpdir = getenv("TMPDIR")) == NULL || *tmpdir == '\0')
tmpdir = _PATH_TMP;
filename1 = argv[0];
@@ -263,15 +263,15 @@ main(int argc, char **argv)
if (!Fflag) {
if (unveil(filename1, "r") == -1)
- err(2, "unveil");
+ err(2, "unveil %s", filename1);
if (unveil(filename2, "r") == -1)
- err(2, "unveil");
+ err(2, "unveil %s", filename2);
if (unveil(tmpdir, "rwc") == -1)
- err(2, "unveil");
+ err(2, "unveil %s", tmpdir);
if (unveil("/usr/bin/diff", "x") == -1)
- err(2, "unveil");
+ err(2, "unveil /usr/bin/diff");
if (unveil(_PATH_BSHELL, "x") == -1)
- err(2, "unveil");
+ err(2, "unveil %s", _PATH_BSHELL);
}
if (pledge("stdio rpath wpath cpath proc exec", NULL) == -1)
err(2, "pledge");
Index: usr.bin/sndiod/sndiod.c
===================================================================
RCS file: /cvs/src/usr.bin/sndiod/sndiod.c,v
retrieving revision 1.45
diff -u -p -u -p -r1.45 sndiod.c
--- usr.bin/sndiod/sndiod.c 8 Mar 2021 09:42:50 -0000 1.45
+++ usr.bin/sndiod/sndiod.c 2 Jul 2021 20:40:21 -0000
@@ -378,7 +378,7 @@ dounveil(char *name, char *prefix, char
errx(1, "%s: unsupported device or port format", name);
snprintf(path, sizeof(path), "%s%s", path_prefix, name + prefix_len);
if (unveil(path, "rw") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", path);
}
static int
Index: usr.bin/su/su.c
===================================================================
RCS file: /cvs/src/usr.bin/su/su.c,v
retrieving revision 1.83
diff -u -p -u -p -r1.83 su.c
--- usr.bin/su/su.c 30 Oct 2020 16:23:57 -0000 1.83
+++ usr.bin/su/su.c 2 Jul 2021 20:40:21 -0000
@@ -161,17 +161,17 @@ main(int argc, char **argv)
}
if (unveil(_PATH_LOGIN_CONF, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_LOGIN_CONF);
if (unveil(_PATH_LOGIN_CONF ".db", "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s.db", _PATH_LOGIN_CONF);
if (unveil(_PATH_AUTHPROGDIR, "x") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_AUTHPROGDIR);
if (unveil(_PATH_SHELLS, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_SHELLS);
if (unveil(_PATH_DEVDB, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_DEVDB);
if (unveil(_PATH_NOLOGIN, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_NOLOGIN);
for (;;) {
char *pw_class = class;
@@ -251,9 +251,9 @@ main(int argc, char **argv)
}
if (unveil(shell, "x") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", shell);
if (unveil(pwd->pw_dir, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", pwd->pw_dir);
if ((p = strrchr(shell, '/')))
avshell = p+1;
@@ -283,7 +283,7 @@ main(int argc, char **argv)
auth_err(as, 1, "%s", pwd->pw_dir);
} else {
if (unveil("/", "r") == -1)
- err(1, "unveil");
+ err(1, "unveil /");
printf("No home directory %s!\n", pwd->pw_dir);
printf("Logging in with home = \"/\".\n");
if (chdir("/") == -1)
Index: usr.bin/systat/main.c
===================================================================
RCS file: /cvs/src/usr.bin/systat/main.c,v
retrieving revision 1.74
diff -u -p -u -p -r1.74 main.c
--- usr.bin/systat/main.c 2 Jun 2021 08:32:22 -0000 1.74
+++ usr.bin/systat/main.c 2 Jul 2021 20:40:21 -0000
@@ -582,7 +582,7 @@ main(int argc, char *argv[])
setup_term(maxlines);
if (unveil("/", "r") == -1)
- err(1, "unveil");
+ err(1, "unveil /");
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
Index: usr.bin/tcpbench/tcpbench.c
===================================================================
RCS file: /cvs/src/usr.bin/tcpbench/tcpbench.c,v
retrieving revision 1.64
diff -u -p -u -p -r1.64 tcpbench.c
--- usr.bin/tcpbench/tcpbench.c 4 Feb 2021 18:46:25 -0000 1.64
+++ usr.bin/tcpbench/tcpbench.c 2 Jul 2021 20:40:21 -0000
@@ -1273,11 +1273,11 @@ main(int argc, char **argv)
if (ptb->kvars) {
if (unveil(_PATH_MEM, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_MEM);
if (unveil(_PATH_KMEM, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_KMEM);
if (unveil(_PATH_KSYMS, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_KSYMS);
if ((ptb->kvmh = kvm_openfiles(NULL, NULL, NULL,
O_RDONLY, kerr)) == NULL)
@@ -1294,7 +1294,7 @@ main(int argc, char **argv)
if (ptb->Uflag)
if (unveil(host, "rwc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", host);
if (pledge("stdio id dns inet unix", NULL) == -1)
err(1, "pledge");
Index: usr.bin/tty/tty.c
===================================================================
RCS file: /cvs/src/usr.bin/tty/tty.c,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 tty.c
--- usr.bin/tty/tty.c 3 Aug 2018 06:55:41 -0000 1.11
+++ usr.bin/tty/tty.c 2 Jul 2021 20:40:21 -0000
@@ -58,7 +58,7 @@ main(int argc, char *argv[])
}
if (unveil(_PATH_DEVDB, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_DEVDB);
if (pledge("stdio rpath", NULL) == -1)
err(1, "pledge");
Index: usr.bin/users/users.c
===================================================================
RCS file: /cvs/src/usr.bin/users/users.c,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 users.c
--- usr.bin/users/users.c 3 Aug 2018 16:02:53 -0000 1.14
+++ usr.bin/users/users.c 2 Jul 2021 20:40:21 -0000
@@ -54,7 +54,7 @@ main(int argc, char *argv[])
int ch;
if (unveil(_PATH_UTMP, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_UTMP);
if (pledge("stdio rpath", NULL) == -1)
err(1, "pledge");
Index: usr.bin/vmstat/vmstat.c
===================================================================
RCS file: /cvs/src/usr.bin/vmstat/vmstat.c,v
retrieving revision 1.150
diff -u -p -u -p -r1.150 vmstat.c
--- usr.bin/vmstat/vmstat.c 28 Nov 2019 16:27:26 -0000 1.150
+++ usr.bin/vmstat/vmstat.c 2 Jul 2021 20:40:21 -0000
@@ -213,7 +213,7 @@ main(int argc, char *argv[])
}
if (unveil("/", "") == -1)
- err(1, "unveil");
+ err(1, "unveil /");
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
Index: usr.bin/wall/wall.c
===================================================================
RCS file: /cvs/src/usr.bin/wall/wall.c,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 wall.c
--- usr.bin/wall/wall.c 28 Jan 2019 20:17:51 -0000 1.34
+++ usr.bin/wall/wall.c 2 Jul 2021 20:40:21 -0000
@@ -116,11 +116,11 @@ main(int argc, char **argv)
makemsg(*argv);
if (unveil(_PATH_UTMP, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_UTMP);
if (unveil(_PATH_DEV, "w") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_DEV);
if (unveil(_PATH_DEVDB, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_DEVDB);
if (pledge("stdio rpath wpath getpw proc", NULL) == -1)
err(1, "pledge");
Index: usr.bin/who/who.c
===================================================================
RCS file: /cvs/src/usr.bin/who/who.c,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 who.c
--- usr.bin/who/who.c 27 Aug 2020 15:20:31 -0000 1.29
+++ usr.bin/who/who.c 2 Jul 2021 20:40:21 -0000
@@ -113,7 +113,7 @@ main(int argc, char *argv[])
if (show_quick) {
only_current_term = show_term = show_idle = show_labels = 0;
}
-
+
if (show_term)
hostwidth -= 2;
if (show_idle)
@@ -123,10 +123,10 @@ main(int argc, char *argv[])
output_labels();
if (unveil(_PATH_UTMP, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_UTMP);
if (show_term || show_idle) {
if (unveil(_PATH_DEV, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_DEV);
}
switch (argc) {
case 0: /* who */
@@ -138,7 +138,7 @@ main(int argc, char *argv[])
who_am_i(ufp);
} else if (show_quick) {
int count = 0;
-
+
while (fread((char *)&usr, sizeof(usr), 1, ufp) == 1) {
if (*usr.ut_name && *usr.ut_line) {
(void)printf("%-*.*s ", NAME_WIDTH,
@@ -159,7 +159,7 @@ main(int argc, char *argv[])
break;
case 1: /* who utmp_file */
if (unveil(*argv, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", *argv);
if (pledge("stdio rpath getpw", NULL) == -1)
err(1, "pledge");
ufp = file(*argv);
Index: usr.sbin/acme-client/chngproc.c
===================================================================
RCS file: /cvs/src/usr.sbin/acme-client/chngproc.c,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 chngproc.c
--- usr.sbin/acme-client/chngproc.c 12 Aug 2019 18:01:44 -0000 1.15
+++ usr.sbin/acme-client/chngproc.c 2 Jul 2021 20:40:21 -0000
@@ -38,7 +38,7 @@ chngproc(int netsock, const char *root)
if (unveil(root, "wc") == -1) {
- warn("unveil");
+ warn("unveil %s", root);
goto out;
}
Index: usr.sbin/acme-client/fileproc.c
===================================================================
RCS file: /cvs/src/usr.sbin/acme-client/fileproc.c,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 fileproc.c
--- usr.sbin/acme-client/fileproc.c 3 Jan 2021 16:32:38 -0000 1.17
+++ usr.sbin/acme-client/fileproc.c 2 Jul 2021 20:40:21 -0000
@@ -100,7 +100,7 @@ fileproc(int certsock, const char *certd
enum fileop op;
if (unveil(certdir, "rwc") == -1) {
- warn("unveil");
+ warn("unveil %s", certdir);
goto out;
}
Index: usr.sbin/acme-client/netproc.c
===================================================================
RCS file: /cvs/src/usr.sbin/acme-client/netproc.c,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 netproc.c
--- usr.sbin/acme-client/netproc.c 24 Dec 2020 08:17:49 -0000 1.29
+++ usr.sbin/acme-client/netproc.c 2 Jul 2021 20:40:21 -0000
@@ -688,7 +688,7 @@ netproc(int kfd, int afd, int Cfd, int c
memset(&c, 0, sizeof(struct conn));
if (unveil(tls_default_ca_cert_file(), "r") == -1) {
- warn("unveil");
+ warn("unveil %s", tls_default_ca_cert_file());
goto out;
}
Index: usr.sbin/acpidump/acpidump.c
===================================================================
RCS file: /cvs/src/usr.sbin/acpidump/acpidump.c,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 acpidump.c
--- usr.sbin/acpidump/acpidump.c 11 May 2019 19:17:56 -0000 1.23
+++ usr.sbin/acpidump/acpidump.c 2 Jul 2021 20:40:21 -0000
@@ -606,25 +606,25 @@ asl_dump_from_devmem(void)
/* Can only unveil if being dumped to a dir */
if (aml_dumpdir) {
if (unveil(aml_dumpfile, "wc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", aml_dumpfile);
} else if (aml_dumpfile[0] == '/') { /* admittedly pretty shitty */
if (unveil("/", "wc") == -1)
- err(1, "unveil");
+ err(1, "unveil /");
} else {
if (unveil(".", "wc") == -1)
- err(1, "unveil");
+ err(1, "unveil .");
}
if (unveil(_PATH_MEM, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_MEM);
if (unveil(_PATH_KMEM, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_KMEM);
if (unveil(_PATH_KVMDB, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_KVMDB);
if (unveil(_PATH_KSYMS, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_KSYMS);
if (unveil(_PATH_UNIX, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_UNIX);
if (pledge("stdio rpath wpath cpath", NULL) == -1)
err(1, "pledge");
Index: usr.sbin/apmd/apmd.c
===================================================================
RCS file: /cvs/src/usr.sbin/apmd/apmd.c,v
retrieving revision 1.105
diff -u -p -u -p -r1.105 apmd.c
--- usr.sbin/apmd/apmd.c 18 Apr 2021 23:51:47 -0000 1.105
+++ usr.sbin/apmd/apmd.c 2 Jul 2021 20:40:21 -0000
@@ -504,7 +504,7 @@ main(int argc, char *argv[])
exit(0);
if (unveil(_PATH_APM_ETC_DIR, "rx") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_APM_ETC_DIR);
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
Index: usr.sbin/dev_mkdb/dev_mkdb.c
===================================================================
RCS file: /cvs/src/usr.sbin/dev_mkdb/dev_mkdb.c,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 dev_mkdb.c
--- usr.sbin/dev_mkdb/dev_mkdb.c 18 Oct 2018 14:37:01 -0000 1.17
+++ usr.sbin/dev_mkdb/dev_mkdb.c 2 Jul 2021 20:40:21 -0000
@@ -65,11 +65,11 @@ main(int argc, char *argv[])
(void)snprintf(dbname, sizeof(dbname), "%sdev.db", _PATH_VARRUN);
if (unveil(_PATH_DEV, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_DEV);
if (unveil(dbtmp, "rwc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", dbtmp);
if (unveil(dbname, "wc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", dbname);
if (pledge("stdio rpath wpath cpath flock", NULL) == -1)
err(1, "pledge");
Index: usr.sbin/dhcpd/pfutils.c
===================================================================
RCS file: /cvs/src/usr.sbin/dhcpd/pfutils.c,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 pfutils.c
--- usr.sbin/dhcpd/pfutils.c 8 Aug 2019 06:59:44 -0000 1.21
+++ usr.sbin/dhcpd/pfutils.c 2 Jul 2021 20:40:21 -0000
@@ -62,7 +62,7 @@ pftable_handler()
/* no filesystem visibility */
if (unveil("/", "") == -1)
- fatal("unveil");
+ fatal("unveil /");
if (unveil(NULL, NULL) == -1)
fatal("unveil");
Index: usr.sbin/hotplugd/hotplugd.c
===================================================================
RCS file: /cvs/src/usr.sbin/hotplugd/hotplugd.c,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 hotplugd.c
--- usr.sbin/hotplugd/hotplugd.c 15 Oct 2020 19:45:50 -0000 1.16
+++ usr.sbin/hotplugd/hotplugd.c 2 Jul 2021 20:40:21 -0000
@@ -77,13 +77,13 @@ main(int argc, char *argv[])
argv += optind;
if (argc > 0)
usage();
-
+
if (unveil(device, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", device);
if (unveil(_PATH_ETC_HOTPLUG_ATTACH, "rx") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_ETC_HOTPLUG_ATTACH);
if (unveil(_PATH_ETC_HOTPLUG_DETACH, "rx") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_ETC_HOTPLUG_DETACH);
if (pledge("stdio rpath proc exec", NULL) == -1)
err(1, "pledge");
Index: usr.sbin/ifstated/ifstated.c
===================================================================
RCS file: /cvs/src/usr.sbin/ifstated/ifstated.c,v
retrieving revision 1.65
diff -u -p -u -p -r1.65 ifstated.c
--- usr.sbin/ifstated/ifstated.c 30 Dec 2020 18:40:44 -0000 1.65
+++ usr.sbin/ifstated/ifstated.c 2 Jul 2021 20:40:21 -0000
@@ -162,9 +162,9 @@ main(int argc, char *argv[])
log_warn("%s: setsockopt tablefilter", __func__);
if (unveil(configfile, "r") == -1)
- fatal("unveil");
+ fatal("unveil %s", configfile);
if (unveil(_PATH_BSHELL, "x") == -1)
- fatal("unveil");
+ fatal("unveil %s", _PATH_BSHELL);
if (pledge("stdio rpath route proc exec", NULL) == -1)
fatal("pledge");
Index: usr.sbin/iostat/iostat.c
===================================================================
RCS file: /cvs/src/usr.sbin/iostat/iostat.c,v
retrieving revision 1.43
diff -u -p -u -p -r1.43 iostat.c
--- usr.sbin/iostat/iostat.c 21 Aug 2020 01:10:07 -0000 1.43
+++ usr.sbin/iostat/iostat.c 2 Jul 2021 20:40:21 -0000
@@ -163,7 +163,7 @@ main(int argc, char *argv[])
dkinit(0);
if (unveil("/", "") == -1)
- err(1, "unveil");
+ err(1, "unveil /");
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
Index: usr.sbin/kvm_mkdb/kvm_mkdb.c
===================================================================
RCS file: /cvs/src/usr.sbin/kvm_mkdb/kvm_mkdb.c,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 kvm_mkdb.c
--- usr.sbin/kvm_mkdb/kvm_mkdb.c 28 Jun 2019 13:32:48 -0000 1.31
+++ usr.sbin/kvm_mkdb/kvm_mkdb.c 2 Jul 2021 20:40:21 -0000
@@ -117,15 +117,15 @@ main(int argc, char *argv[])
if (argc > 0) {
if (unveil(argv[0], "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", argv[0]);
} else {
if (unveil(_PATH_UNIX, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_UNIX);
if (unveil(_PATH_KSYMS, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_KSYMS);
}
if (unveil(dbdir, "rwc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", dbdir);
if (pledge("stdio rpath wpath cpath fattr flock", NULL) == -1)
err(1, "pledge");
Index: usr.sbin/ldapd/ldapd.c
===================================================================
RCS file: /cvs/src/usr.sbin/ldapd/ldapd.c,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 ldapd.c
--- usr.sbin/ldapd/ldapd.c 27 Jan 2021 22:12:28 -0000 1.27
+++ usr.sbin/ldapd/ldapd.c 2 Jul 2021 20:40:21 -0000
@@ -237,15 +237,15 @@ main(int argc, char *argv[])
ldapd_needfd);
if (unveil(_PATH_NOLOGIN, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_NOLOGIN);
if (unveil(_PATH_LOGIN_CONF, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_LOGIN_CONF);
if (unveil(_PATH_LOGIN_CONF ".db", "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s.db", _PATH_LOGIN_CONF);
if (unveil(_PATH_AUTHPROGDIR, "x") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_AUTHPROGDIR);
if (unveil(datadir, "rw") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", datadir);
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
Index: usr.sbin/makefs/cd9660.c
===================================================================
RCS file: /cvs/src/usr.sbin/makefs/cd9660.c,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 cd9660.c
--- usr.sbin/makefs/cd9660.c 20 Nov 2018 01:13:14 -0000 1.21
+++ usr.sbin/makefs/cd9660.c 2 Jul 2021 20:40:21 -0000
@@ -1975,7 +1975,7 @@ cd9660_add_generic_bootimage(iso9660_dis
diskStructure->generic_bootimage = estrdup(bootimage);
if (unveil(diskStructure->generic_bootimage, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", diskStructure->generic_bootimage);
/* Get information about the file */
if (lstat(diskStructure->generic_bootimage, &stbuf) == -1)
err(1, "%s: lstat(\"%s\")", __func__,
Index: usr.sbin/makefs/makefs.c
===================================================================
RCS file: /cvs/src/usr.sbin/makefs/makefs.c,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 makefs.c
--- usr.sbin/makefs/makefs.c 24 Sep 2018 22:55:50 -0000 1.20
+++ usr.sbin/makefs/makefs.c 2 Jul 2021 20:40:21 -0000
@@ -199,9 +199,9 @@ main(int argc, char *argv[])
usage();
if (unveil(argv[0], "rwc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", argv[0]);
if (unveil(argv[1], "rw") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", argv[1]);
if (pledge("stdio rpath wpath cpath", NULL) == -1)
err(1, "pledge");
Index: usr.sbin/makefs/cd9660/cd9660_eltorito.c
===================================================================
RCS file: /cvs/src/usr.sbin/makefs/cd9660/cd9660_eltorito.c,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 cd9660_eltorito.c
--- usr.sbin/makefs/cd9660/cd9660_eltorito.c 20 Nov 2018 01:13:15 -0000 1.14
+++ usr.sbin/makefs/cd9660/cd9660_eltorito.c 2 Jul 2021 20:40:21 -0000
@@ -120,7 +120,7 @@ cd9660_add_boot_disk(iso9660_disk *diskS
free(temp);
if (unveil(new_image->filename, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", new_image->filename);
/* Get information about the file */
if (lstat(new_image->filename, &stbuf) == -1)
err(1, "%s: lstat(\"%s\")", __func__, new_image->filename);
Index: usr.sbin/ntpd/ntpd.c
===================================================================
RCS file: /cvs/src/usr.sbin/ntpd/ntpd.c,v
retrieving revision 1.129
diff -u -p -u -p -r1.129 ntpd.c
--- usr.sbin/ntpd/ntpd.c 12 Feb 2020 19:14:56 -0000 1.129
+++ usr.sbin/ntpd/ntpd.c 2 Jul 2021 20:40:21 -0000
@@ -284,9 +284,9 @@ main(int argc, char *argv[])
* then privdrop into chroot before speaking to the outside world.
*/
if (unveil(tls_default_ca_cert_file(), "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", tls_default_ca_cert_file());
if (unveil("/usr/sbin/ntpd", "x") == -1)
- err(1, "unveil");
+ err(1, "unveil /usr/sbin/ntpd");
if (pledge("stdio rpath inet settime proc exec id", NULL) == -1)
err(1, "pledge");
Index: usr.sbin/ocspcheck/ocspcheck.c
===================================================================
RCS file: /cvs/src/usr.sbin/ocspcheck/ocspcheck.c,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 ocspcheck.c
--- usr.sbin/ocspcheck/ocspcheck.c 9 Feb 2021 16:55:51 -0000 1.29
+++ usr.sbin/ocspcheck/ocspcheck.c 2 Jul 2021 20:40:21 -0000
@@ -617,14 +617,14 @@ main(int argc, char **argv)
if (cafile != NULL) {
if (unveil(cafile, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", cafile);
}
if (cadir != NULL) {
if (unveil(cadir, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", cadir);
}
if (unveil(certfile, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", certfile);
if (pledge("stdio inet rpath dns", NULL) == -1)
err(1, "pledge");
Index: usr.sbin/pcidump/pcidump.c
===================================================================
RCS file: /cvs/src/usr.sbin/pcidump/pcidump.c,v
retrieving revision 1.64
diff -u -p -u -p -r1.64 pcidump.c
--- usr.sbin/pcidump/pcidump.c 30 May 2021 02:24:43 -0000 1.64
+++ usr.sbin/pcidump/pcidump.c 2 Jul 2021 20:40:21 -0000
@@ -191,7 +191,7 @@ main(int argc, char *argv[])
}
if (unveil("/dev", "r") == -1)
- err(1, "unveil");
+ err(1, "unveil /dev");
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
Index: usr.sbin/pstat/pstat.c
===================================================================
RCS file: /cvs/src/usr.sbin/pstat/pstat.c,v
retrieving revision 1.123
diff -u -p -u -p -r1.123 pstat.c
--- usr.sbin/pstat/pstat.c 28 Sep 2020 15:53:13 -0000 1.123
+++ usr.sbin/pstat/pstat.c 2 Jul 2021 20:40:21 -0000
@@ -230,7 +230,7 @@ main(int argc, char *argv[])
}
if (unveil(_PATH_DEVDB, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_DEVDB);
if (pledge("stdio rpath vminfo", NULL) == -1)
err(1, "pledge");
Index: usr.sbin/relayd/relayd.c
===================================================================
RCS file: /cvs/src/usr.sbin/relayd/relayd.c,v
retrieving revision 1.186
diff -u -p -u -p -r1.186 relayd.c
--- usr.sbin/relayd/relayd.c 27 Jan 2021 07:21:54 -0000 1.186
+++ usr.sbin/relayd/relayd.c 2 Jul 2021 20:40:22 -0000
@@ -225,7 +225,7 @@ main(int argc, char *argv[])
log_info("startup");
if (unveil("/", "rx") == -1)
- err(1, "unveil");
+ err(1, "unveil /");
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
Index: usr.sbin/sensorsd/sensorsd.c
===================================================================
RCS file: /cvs/src/usr.sbin/sensorsd/sensorsd.c,v
retrieving revision 1.67
diff -u -p -u -p -r1.67 sensorsd.c
--- usr.sbin/sensorsd/sensorsd.c 22 Jul 2020 15:33:49 -0000 1.67
+++ usr.sbin/sensorsd/sensorsd.c 2 Jul 2021 20:40:22 -0000
@@ -147,11 +147,11 @@ main(int argc, char *argv[])
chdir("/");
if (unveil(configfile, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", configfile);
if (unveil(configdb, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", configdb);
if (unveil("/", "x") == -1)
- err(1, "unveil");
+ err(1, "unveil /");
if (pledge("stdio rpath proc exec", NULL) == -1)
err(1, "pledge");
Index: usr.sbin/syslogd/privsep.c
===================================================================
RCS file: /cvs/src/usr.sbin/syslogd/privsep.c,v
retrieving revision 1.72
diff -u -p -u -p -r1.72 privsep.c
--- usr.sbin/syslogd/privsep.c 16 Sep 2020 11:03:36 -0000 1.72
+++ usr.sbin/syslogd/privsep.c 2 Jul 2021 20:40:22 -0000
@@ -185,24 +185,24 @@ priv_exec(char *conf, int numeric, int c
errx(1, "unknown user _syslogd");
if (unveil(conf, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", conf);
if (unveil(_PATH_UTMP, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_UTMP);
if (unveil(_PATH_DEV, "rw") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_DEV);
if (unveil(_PATH_LOGPID, "c") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_LOGPID);
/* for pipes */
if (unveil(_PATH_BSHELL, "x") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_BSHELL);
/* For HUP / re-exec */
if (unveil("/usr/sbin/syslogd", "x") == -1)
- err(1, "unveil");
+ err(1, "unveil /usr/sbin/syslogd");
if (argv[0][0] == '/')
if (unveil(argv[0], "x") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", argv[0]);
if (pledge("stdio unveil rpath wpath cpath dns sendfd id proc exec",
NULL) == -1)
Index: usr.sbin/tcpdrop/tcpdrop.c
===================================================================
RCS file: /cvs/src/usr.sbin/tcpdrop/tcpdrop.c,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 tcpdrop.c
--- usr.sbin/tcpdrop/tcpdrop.c 27 Nov 2019 17:49:09 -0000 1.19
+++ usr.sbin/tcpdrop/tcpdrop.c 2 Jul 2021 20:40:22 -0000
@@ -65,9 +65,9 @@ main(int argc, char **argv)
int gaierr, rval = 0;
if (unveil(_PATH_HOSTS, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_HOSTS);
if (unveil(_PATH_RESCONF, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_RESCONF);
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
Index: usr.sbin/tcpdump/privsep.c
===================================================================
RCS file: /cvs/src/usr.sbin/tcpdump/privsep.c,v
retrieving revision 1.55
diff -u -p -u -p -r1.55 privsep.c
--- usr.sbin/tcpdump/privsep.c 4 Dec 2020 11:36:13 -0000 1.55
+++ usr.sbin/tcpdump/privsep.c 2 Jul 2021 20:40:22 -0000
@@ -316,9 +316,9 @@ priv_exec(int argc, char *argv[])
drop_privs(1);
if (unveil("/etc/ethers", "r") == -1)
- err(1, "unveil");
+ err(1, "unveil /etc/ethers");
if (unveil("/etc/rpc", "r") == -1)
- err(1, "unveil");
+ err(1, "unveil /etc/rpc");
if (pledge("stdio rpath dns bpf", NULL) == -1)
err(1, "pledge");
Index: usr.sbin/traceroute/traceroute.c
===================================================================
RCS file: /cvs/src/usr.sbin/traceroute/traceroute.c,v
retrieving revision 1.163
diff -u -p -u -p -r1.163 traceroute.c
--- usr.sbin/traceroute/traceroute.c 11 Feb 2020 18:41:39 -0000 1.163
+++ usr.sbin/traceroute/traceroute.c 2 Jul 2021 20:40:22 -0000
@@ -329,7 +329,7 @@ main(int argc, char *argv[])
/* Cannot pledge due to special setsockopt()s below */
if (unveil("/", "r") == -1)
- err(1, "unveil");
+ err(1, "unveil /");
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
Index: usr.sbin/unbound/smallapp/unbound-anchor.c
===================================================================
RCS file: /cvs/src/usr.sbin/unbound/smallapp/unbound-anchor.c,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 unbound-anchor.c
--- usr.sbin/unbound/smallapp/unbound-anchor.c 12 Mar 2021 19:45:27 -0000 1.16
+++ usr.sbin/unbound/smallapp/unbound-anchor.c 2 Jul 2021 20:40:22 -0000
@@ -2418,17 +2418,17 @@ int main(int argc, char* argv[])
exit(0);
}
if (unveil(root_anchor_temppath, "rwc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", root_anchor_temppath);
free(root_anchor_temppath);
free(s);
if (unveil(root_cert_file, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", root_cert_file);
if (res_conf != NULL && unveil(res_conf, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", res_conf);
if (root_hints != NULL && unveil(root_hints, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", root_hints);
if (debugconf != NULL && unveil(debugconf, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", debugconf);
if (pledge("stdio rpath wpath cpath inet dns", NULL) == -1)
err(1, "pledge");
Index: usr.sbin/usbdevs/usbdevs.c
===================================================================
RCS file: /cvs/src/usr.sbin/usbdevs/usbdevs.c,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 usbdevs.c
--- usr.sbin/usbdevs/usbdevs.c 22 Dec 2019 14:02:38 -0000 1.33
+++ usr.sbin/usbdevs/usbdevs.c 2 Jul 2021 20:40:22 -0000
@@ -263,7 +263,7 @@ main(int argc, char **argv)
usage();
if (unveil("/dev", "r") == -1)
- err(1, "unveil");
+ err(1, "unveil /dev");
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
Index: usr.sbin/vipw/vipw.c
===================================================================
RCS file: /cvs/src/usr.sbin/vipw/vipw.c,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 vipw.c
--- usr.sbin/vipw/vipw.c 28 Jun 2019 13:32:51 -0000 1.24
+++ usr.sbin/vipw/vipw.c 2 Jul 2021 20:40:22 -0000
@@ -64,13 +64,13 @@ main(int argc, char *argv[])
usage();
if (unveil(_PATH_MASTERPASSWD_LOCK, "rwc") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_MASTERPASSWD_LOCK);
if (unveil(_PATH_MASTERPASSWD, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_MASTERPASSWD);
if (unveil(_PATH_BSHELL, "x") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_BSHELL);
if (unveil(_PATH_PWD_MKDB, "x") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", _PATH_PWD_MKDB);
if (pledge("stdio rpath wpath cpath fattr proc exec", NULL) == -1)
err(1, "pledge");
Index: usr.sbin/vmctl/main.c
===================================================================
RCS file: /cvs/src/usr.sbin/vmctl/main.c,v
retrieving revision 1.67
diff -u -p -u -p -r1.67 main.c
--- usr.sbin/vmctl/main.c 28 Jun 2021 14:01:38 -0000 1.67
+++ usr.sbin/vmctl/main.c 2 Jul 2021 20:40:22 -0000
@@ -197,7 +197,7 @@ vmmaction(struct parse_result *res)
if (ctl_sock == -1) {
if (unveil(SOCKET_NAME, "r") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", SOCKET_NAME);
if ((ctl_sock = socket(AF_UNIX,
SOCK_STREAM|SOCK_CLOEXEC, 0)) == -1)
err(1, "socket");
@@ -1023,7 +1023,7 @@ ctl_openconsole(const char *name)
{
closefrom(STDERR_FILENO + 1);
if (unveil(VMCTL_CU, "x") == -1)
- err(1, "unveil");
+ err(1, "unveil %s", VMCTL_CU);
execl(VMCTL_CU, VMCTL_CU, "-r", "-l", name, "-s", "115200",
(char *)NULL);
err(1, "failed to open the console");
