d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash if a process sends itself a SIGTRAP. Just forward it as expected.

Browse Source 
MFC after:	2 weeks [needs rewrite]
Relnotes:	yes
This commit is contained in:
bdrewery 2015-10-05 21:39:07 +00:00
parent e2e358d7ec
commit 7195bed2f5
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.bin/truss/setup.c
View File

@ -564,15 +564,12 @@ eventloop(struct trussinfo *info)
}
find_thread(info, si.si_pid, pl.pl_lwpid);
if (si.si_status == SIGTRAP) {
if (si.si_status == SIGTRAP &&
(pl.pl_flags & (PL_FLAG_SCE|PL_FLAG_SCX)) != 0) {
if (pl.pl_flags & PL_FLAG_SCE)
enter_syscall(info, &pl);
else if (pl.pl_flags & PL_FLAG_SCX)
exit_syscall(info, &pl);
else
errx(1,
"pl_flags %x contains neither PL_FLAG_SCE nor PL_FLAG_SCX",
pl.pl_flags);
pending_signal = 0;
} else if (pl.pl_flags & PL_FLAG_CHILD) {
if ((info->flags & COUNTONLY) == 0)