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 (nik...@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);
  }


_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to