From 37214e4c31e5dd3ca23de48980bf225e5beb7ebf Mon Sep 17 00:00:00 2001 From: deraadt Date: Wed, 7 Oct 2015 04:00:45 +0000 Subject: [PATCH] tame "stdio rpath" at the start, then potentially some files are opened. After that, tame "stdio" because that's all this program does. --- usr.bin/join/join.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c index 9c68821f067..ee51c1cac20 100644 --- a/usr.bin/join/join.c +++ b/usr.bin/join/join.c @@ -1,4 +1,4 @@ -/* $OpenBSD: join.c,v 1.25 2015/07/21 04:42:59 jasper Exp $ */ +/* $OpenBSD: join.c,v 1.26 2015/10/07 04:00:45 deraadt Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -104,6 +104,9 @@ main(int argc, char *argv[]) int aflag, ch, cval, vflag; char *end; + if (tame("stdio rpath", NULL) == -1) + err(1, "tame"); + F1 = &input1; F2 = &input2; @@ -208,6 +211,9 @@ main(int argc, char *argv[]) if (F1->fp == stdin && F2->fp == stdin) errx(1, "only one input file may be stdin"); + if (tame("stdio", NULL) == -1) + err(1, "tame"); + F1->setusedc = 0; F2->setusedc = 0; slurp(F1); -- 2.20.1