From owner-svn-src-stable@freebsd.org  Tue Oct 20 18:35:53 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 9D022A1A47F;
 Tue, 20 Oct 2015 18:35:53 +0000 (UTC)
 (envelope-from bdrewery@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 653D170;
 Tue, 20 Oct 2015 18:35:53 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9KIZqsG025863;
 Tue, 20 Oct 2015 18:35:52 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9KIZqaE025862;
 Tue, 20 Oct 2015 18:35:52 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201510201835.t9KIZqaE025862@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 20 Oct 2015 18:35:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r289641 - stable/10/usr.bin/truss
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Oct 2015 18:35:53 -0000

Author: bdrewery
Date: Tue Oct 20 18:35:52 2015
New Revision: 289641
URL: https://svnweb.freebsd.org/changeset/base/289641

Log:
  MFC r288903:
  
    Fix crash if a process sends itself a SIGTRAP.  Just forward it as expected.
  
    This does not match head as the code was rewritten significantly there.
  
  Relnotes:	yes

Modified:
  stable/10/usr.bin/truss/setup.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/truss/setup.c
==============================================================================
--- stable/10/usr.bin/truss/setup.c	Tue Oct 20 18:23:44 2015	(r289640)
+++ stable/10/usr.bin/truss/setup.c	Tue Oct 20 18:35:52 2015	(r289641)
@@ -221,11 +221,9 @@ detach:
 				info->pr_why = S_SCX;
 				info->curthread->in_syscall = 0;
 				break;
-			} else {
-				errx(1,
-		   "pl_flags %x contains neither PL_FLAG_SCE nor PL_FLAG_SCX",
-				    lwpinfo.pl_flags);
 			}
+			/* We didn't send the SIGTRAP, just forward it. */
+			/* FALLTHROUGH */
 		default:
 			info->pr_why = S_SIG;
 			info->pr_data = WSTOPSIG(waitval);