From owner-svn-src-head@FreeBSD.ORG  Sat Nov 13 09:28:49 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7B2F6106566B;
	Sat, 13 Nov 2010 09:28:49 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 690CB8FC0A;
	Sat, 13 Nov 2010 09:28:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAD9SnbZ042316;
	Sat, 13 Nov 2010 09:28:49 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAD9Snfx042314;
	Sat, 13 Nov 2010 09:28:49 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201011130928.oAD9Snfx042314@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Sat, 13 Nov 2010 09:28:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215235 - head/usr.bin/truss
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Nov 2010 09:28:49 -0000

Author: jh
Date: Sat Nov 13 09:28:49 2010
New Revision: 215235
URL: http://svn.freebsd.org/changeset/base/215235

Log:
  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

Modified:
  head/usr.bin/truss/main.c

Modified: head/usr.bin/truss/main.c
==============================================================================
--- head/usr.bin/truss/main.c	Sat Nov 13 08:58:36 2010	(r215234)
+++ head/usr.bin/truss/main.c	Sat Nov 13 09:28:49 2010	(r215235)
@@ -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 --