From e04c3786831223dd5b746ab9c2a4fc03897e9b99 Mon Sep 17 00:00:00 2001 From: Jaakko Heinonen Date: Sat, 13 Nov 2010 09:28:49 +0000 Subject: Set FD_CLOEXEC for the output file only when the file has been specified with the -o option. Setting the flag for stderr (the default) could cause the traced process to redirect stderr to a random file. PR: bin/152151 Submitted by: ashish MFC after: 5 days --- usr.bin/truss/main.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'usr.bin/truss') diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c index b9dcfe4e7fec..d25c4de1be34 100644 --- a/usr.bin/truss/main.c +++ b/usr.bin/truss/main.c @@ -241,13 +241,14 @@ main(int ac, char **av) if (fname != NULL) { /* Use output file */ if ((trussinfo->outfile = fopen(fname, "w")) == NULL) errx(1, "cannot open %s", fname); + /* + * Set FD_CLOEXEC, so that the output file is not shared with + * the traced process. + */ + if (fcntl(fileno(trussinfo->outfile), F_SETFD, FD_CLOEXEC) == + -1) + warn("fcntl()"); } - /* - * Set FD_CLOEXEC, so that the output file is not shared with - * the traced process. - */ - if (fcntl(fileno(trussinfo->outfile), F_SETFD, FD_CLOEXEC) == -1) - warn("fcntl()"); /* * If truss starts the process itself, it will ignore some signals -- -- cgit v1.2.3