From owner-svn-src-stable-7@FreeBSD.ORG  Mon Oct 11 13:31:10 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 290F4106566B;
	Mon, 11 Oct 2010 13:31:10 +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 1780E8FC13;
	Mon, 11 Oct 2010 13:31:10 +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 o9BDV97H016727;
	Mon, 11 Oct 2010 13:31:09 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9BDV9x1016725;
	Mon, 11 Oct 2010 13:31:09 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201010111331.o9BDV9x1016725@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Mon, 11 Oct 2010 13:31:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213690 - stable/7/usr.bin/truss
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Oct 2010 13:31:10 -0000

Author: jh
Date: Mon Oct 11 13:31:09 2010
New Revision: 213690
URL: http://svn.freebsd.org/changeset/base/213690

Log:
  MFC r200752:
  
  Avoid sharing the file descriptor of the output file with traced
  processes by setting the FD_CLOEXEC flag for the output file.
  
  PR:		bin/140493

Modified:
  stable/7/usr.bin/truss/main.c
Directory Properties:
  stable/7/usr.bin/truss/   (props changed)

Modified: stable/7/usr.bin/truss/main.c
==============================================================================
--- stable/7/usr.bin/truss/main.c	Mon Oct 11 12:57:41 2010	(r213689)
+++ stable/7/usr.bin/truss/main.c	Mon Oct 11 13:31:09 2010	(r213690)
@@ -231,6 +231,12 @@ main(int ac, char **av)
 		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()");
 
 	/*
 	 * If truss starts the process itself, it will ignore some signals --