Date: Sun, 14 Aug 2016 23:34:02 +0000 From: Glen Barber <gjb@FreeBSD.org> To: Steven Hartland <steven.hartland@multiplay.co.uk> Cc: Baptiste Daroussin <bapt@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r304104 - stable/11/usr.bin/truss Message-ID: <20160814233402.GL11079@FreeBSD.org> In-Reply-To: <e29a2e1d-02cc-588c-318d-9bf1c07c9ab6@multiplay.co.uk> References: <201608142243.u7EMhnA4029277@repo.freebsd.org> <e29a2e1d-02cc-588c-318d-9bf1c07c9ab6@multiplay.co.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
--LXESt2jNC8oCvz8w Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Once re@ receives the proper request, yes. Glen On Mon, Aug 15, 2016 at 12:28:40AM +0100, Steven Hartland wrote: > This going to make it into 11.0-RELEASE? >=20 > 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 > >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > >--- 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 =3D new_thread(p, lwps[i]); > > if (ptrace(PT_LWPINFO, lwps[i], (caddr_t)&pl, sizeof(pl)) =3D=3D -1) > > err(1, "ptrace(PT_LWPINFO)"); > >- if (pl.pl_flags & PL_FLAG_SCE) > >+ if (pl.pl_flags & PL_FLAG_SCE) { > >+ info->curthread =3D t; > > enter_syscall(info, t, &pl); > >+ } > > } > > free(lwps); > > } > > >=20 --LXESt2jNC8oCvz8w Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXsP/qAAoJEAMUWKVHj+KTlCkP/2IsKJLgEMCL4PprsjRQTuOf QbXnN2aE8eE7tDL8aie14SZUllrYZgcqN+KyUEP6LLwQrgu/noJkKY49v+V57oYY CKhFXTxs6wx4oJLg0IJxnR0wzAwSlhl/bRFtE34WtRCK7vTugbNRB3G0WAuaHh/X EAIDzT6pO4LqM7u9gI927m4bmVyEmlPs5p7/K+XMqb6qd0EoyBDgSnGbO/b1Arve xx/Nmx0boijpOLEtMCDg+8KIRKpWfwkNDBklpZxxocWg7KVU5CDdxAUSwQw6zk2m L9xsihVBSJblpw736okpjpg9007yOZ9mt855Q8XLmIeJDk1Ghzf7HpcBqEcTCF6D 3PEMd1g8Kw0jIkgwh4WHwC+ZmJl6Snd4vKqJHScTdgDT8NWWlZYhcsQkxZbgjtsE pUkiqnkSnl9NDgDSeO3euQ+3Q6qAWokwckKT+qS4J4Bo46x55AsHOR49s/xCSdc/ Asew6NniBYIobWtFQmQBhlzPpRTrHhUCAghBWjWGgqcNhbH6y8o0rQ5D1/A4E1Cb uT25vwFEDki0Sll2iSIBZMe6k2zk1isQDpnau6vUyj0oGKA+N3m4vmUC9U/TNSLS 2t2xImhgq+eyjTqM/0z2PfuXiyTvRo8SGYTdcJXUmNORRURnf27KGRRQNQZvmbbi VdYe939AI7GsfPFBRa4D =cL7P -----END PGP SIGNATURE----- --LXESt2jNC8oCvz8w--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20160814233402.GL11079>