summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2015-10-20 18:35:52 +0000
committerbdrewery <bdrewery@FreeBSD.org>2015-10-20 18:35:52 +0000
commit8db7e0379c3e878a653101ef72e1067985e03b2d (patch)
tree1e57fec8a7d2da8a9409feca1fac7986ba84c190
parent8124ba9df4684bd43c2f4172cc0590fbab0f8ef0 (diff)
downloadFreeBSD-src-8db7e0379c3e878a653101ef72e1067985e03b2d.zip
FreeBSD-src-8db7e0379c3e878a653101ef72e1067985e03b2d.tar.gz
MFC r288903:
Fix crash if a process sends itself a SIGTRAP. Just forward it as expected. This does not match head as the code was rewritten significantly there. Relnotes: yes
-rw-r--r--usr.bin/truss/setup.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c
index d6e4300..a52bd16 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -221,11 +221,9 @@ detach:
info->pr_why = S_SCX;
info->curthread->in_syscall = 0;
break;
- } else {
- errx(1,
- "pl_flags %x contains neither PL_FLAG_SCE nor PL_FLAG_SCX",
- lwpinfo.pl_flags);
}
+ /* We didn't send the SIGTRAP, just forward it. */
+ /* FALLTHROUGH */
default:
info->pr_why = S_SIG;
info->pr_data = WSTOPSIG(waitval);
OpenPOWER on IntegriCloud