diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-10-05 13:30:30 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-10-05 13:30:30 +0000 |
| commit | 18cdc26982103640b171cb7ffc6bb8b153c21dc1 (patch) | |
| tree | f1a30e0c125993217c13ac9a6256c0ea4c3d00f1 /usr.bin/diff3 | |
| parent | This can use tame "stdio rpath" from the top. If we are only working on (diff) | |
| download | wireguard-openbsd-18cdc26982103640b171cb7ffc6bb8b153c21dc1.tar.xz wireguard-openbsd-18cdc26982103640b171cb7ffc6bb8b153c21dc1.zip | |
tame "stdio rpath" or tame "stdio" suffices for all of these programs.
fairly easy to audit by running nm and noticing nothing beyond base
stdio except for fopen/freopen. Then review all callpaths to those
functions, and place the tame() calls.
ok sthen
Diffstat (limited to 'usr.bin/diff3')
| -rw-r--r-- | usr.bin/diff3/diff3prog.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/diff3/diff3prog.c b/usr.bin/diff3/diff3prog.c index 86d836e59d5..921da78a548 100644 --- a/usr.bin/diff3/diff3prog.c +++ b/usr.bin/diff3/diff3prog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3prog.c,v 1.15 2015/09/05 09:47:08 jsg Exp $ */ +/* $OpenBSD: diff3prog.c,v 1.16 2015/10/05 13:30:30 deraadt Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -145,6 +145,9 @@ main(int argc, char **argv) { int ch, i, m, n; + if (tame("stdio rpath", NULL) == -1) + err(1, "tame"); + eflag = 0; oflag = 0; while ((ch = getopt(argc, argv, "EeXx3")) != -1) { |