From owner-svn-src-all@freebsd.org  Mon Aug 15 08:20:39 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5E72DBBACB2;
 Mon, 15 Aug 2016 08:20:39 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 316DD1456;
 Mon, 15 Aug 2016 08:20:39 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7F8KcGi041519;
 Mon, 15 Aug 2016 08:20:38 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7F8KcHS041518;
 Mon, 15 Aug 2016 08:20:38 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201608150820.u7F8KcHS041518@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 15 Aug 2016 08:20:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r304113 - releng/11.0/usr.bin/truss
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Aug 2016 08:20:39 -0000

Author: bapt
Date: Mon Aug 15 08:20:37 2016
New Revision: 304113
URL: https://svnweb.freebsd.org/changeset/base/304113

Log:
  MFC: r303685
  
  truss: fix uninitialized trussinfo->curthread in add_threads()/enter_syscall
  
  trussinfo->curthread must be initialized before calling enter_syscall(),
  it is used by t->proc->abi->fetch_args().
  Without that truss is segfaulting and the attached program also crash.
  
  Submitted by:	Nikita Kozlov (nikita@gandi.net)
  Reviewed by:	jhb
  Approved by:	re (gjb)
  Differential Revision:	https://reviews.freebsd.org/D7399

Modified:
  releng/11.0/usr.bin/truss/setup.c
Directory Properties:
  releng/11.0/   (props changed)

Modified: releng/11.0/usr.bin/truss/setup.c
==============================================================================
--- releng/11.0/usr.bin/truss/setup.c	Mon Aug 15 08:07:07 2016	(r304112)
+++ releng/11.0/usr.bin/truss/setup.c	Mon Aug 15 08:20:37 2016	(r304113)
@@ -223,8 +223,10 @@ add_threads(struct trussinfo *info, stru
 		t = new_thread(p, lwps[i]);
 		if (ptrace(PT_LWPINFO, lwps[i], (caddr_t)&pl, sizeof(pl)) == -1)
 			err(1, "ptrace(PT_LWPINFO)");
-		if (pl.pl_flags & PL_FLAG_SCE)
+		if (pl.pl_flags & PL_FLAG_SCE) {
+			info->curthread = t;
 			enter_syscall(info, t, &pl);
+		}
 	}
 	free(lwps);
 }