From owner-svn-src-stable@freebsd.org Sun Aug 14 23:28:39 2016 Return-Path: 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 CB613BB9456 for ; Sun, 14 Aug 2016 23:28:39 +0000 (UTC) (envelope-from steven.hartland@multiplay.co.uk) Received: from mail-wm0-x22c.google.com (mail-wm0-x22c.google.com [IPv6:2a00:1450:400c:c09::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6E5CF1497 for ; Sun, 14 Aug 2016 23:28:39 +0000 (UTC) (envelope-from steven.hartland@multiplay.co.uk) Received: by mail-wm0-x22c.google.com with SMTP id i5so74104102wmg.0 for ; Sun, 14 Aug 2016 16:28:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=multiplay-co-uk.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to; bh=eQXQHDX5jc6LaD5eCvR9AXqJbi88AUIzffxVcGFVMqI=; b=Tok11dp27Y9pjLJNXv5A8QN8/q0t8VPSXPTOZPSvPz9iImeaIzWxGZnbiDNZ5PDX0e knu5hfvXVwvGXM5dR2thJHHGr3DFV2itraiqx49Ius9pFmfVRzp78vh/XNAS9ifgyXVE P7hGKxH80Kxkj5HX1WUHHLcAKzSWf9ZOA5wmO5y0hLU8B1VMdfFfy3viVfyqz6CLpyI4 wViddOJtPGq/ChOO1JI/6rGc5irA4wnnLM0bqwJ/ycNK/eu6LfhvacVGnc9xNRY6a/z6 ja2lUIL/qpsfUlALlH4HCBr7YTFwFNKicJfjkmIgPQE5FJSyQsVFclK7y5pN9JtkESeh MOmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to; bh=eQXQHDX5jc6LaD5eCvR9AXqJbi88AUIzffxVcGFVMqI=; b=PBOS3PsLA6ZBNq4WBDIvirOr7KB4E7cUNttT726kTl5qTglTb8k9yDfgeeSoJNeeh1 xFFOx3OinUS/egKQnCa7pBHVrafzNKKA1IIT3ZGcvH4tiXn94JiKlOC1phpejVgCCFMs IeyZnOzbpvgabhPTEDXSeCyqumFHt0b3MWf5cbUZjp3HXvpa60zYQbXtBLFt73Yhq6mQ Yl+xTWSHG2Nh9CEmfbR8xUrAMnEeJ15lMiHHTvEz9cbvSavhKKCaY+M/wNqPH+gfFvJE l9r7Ap2fWsXEijJezP5ok142H5TtDiLrK94AexH7ZMqXC6zuz9KOpJOghVQqnytP/mZd 0z3A== X-Gm-Message-State: AEkoouukc+OSaVpw2Sf6CjJJqA8qwRPqAwPNL67ZKxyUxbNoapIocFhaTJkmb8w/EIKxN5oh X-Received: by 10.194.176.165 with SMTP id cj5mr33200890wjc.82.1471217317948; Sun, 14 Aug 2016 16:28:37 -0700 (PDT) Received: from [10.10.1.58] (liv3d.labs.multiplay.co.uk. [82.69.141.171]) by smtp.gmail.com with ESMTPSA id c8sm18679181wjm.19.2016.08.14.16.28.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Aug 2016 16:28:36 -0700 (PDT) Subject: Re: svn commit: r304104 - stable/11/usr.bin/truss To: Baptiste Daroussin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org References: <201608142243.u7EMhnA4029277@repo.freebsd.org> From: Steven Hartland Message-ID: Date: Mon, 15 Aug 2016 00:28:40 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <201608142243.u7EMhnA4029277@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.22 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Aug 2016 23:28:39 -0000 This going to make it into 11.0-RELEASE? On 14/08/2016 23:43, Baptiste Daroussin wrote: > Author: bapt > Date: Sun Aug 14 22:43:48 2016 > New Revision: 304104 > URL: https://svnweb.freebsd.org/changeset/base/304104 > > 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 > Differential Revision: https://reviews.freebsd.org/D7399 > > Modified: > stable/11/usr.bin/truss/setup.c > Directory Properties: > stable/11/ (props changed) > > Modified: stable/11/usr.bin/truss/setup.c > ============================================================================== > --- stable/11/usr.bin/truss/setup.c Sun Aug 14 22:08:25 2016 (r304103) > +++ stable/11/usr.bin/truss/setup.c Sun Aug 14 22:43:48 2016 (r304104) > @@ -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); > } >