diff options
| author | bapt <bapt@FreeBSD.org> | 2016-08-15 08:20:37 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2016-08-15 08:20:37 +0000 |
| commit | 0b3146d137d8bafa9cac9c55478c5a9fdcae1467 (patch) | |
| tree | b45fee618665f6db88ace21f19e9d71fc77aa7ad /usr.bin | |
| parent | f893e2a794abc688ffea2f813a0be6031c8e7a8c (diff) | |
| download | FreeBSD-src-0b3146d137d8bafa9cac9c55478c5a9fdcae1467.zip FreeBSD-src-0b3146d137d8bafa9cac9c55478c5a9fdcae1467.tar.gz | |
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
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/truss/setup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c index c134405..a14c016 100644 --- a/usr.bin/truss/setup.c +++ b/usr.bin/truss/setup.c @@ -223,8 +223,10 @@ add_threads(struct trussinfo *info, struct procinfo *p) 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); } |
