diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2018-06-22 20:01:10 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-06-22 20:01:10 +0200 |
| commit | cb93a59bbf1d3db1aa49e2cfb1bbabdca2f63e94 (patch) | |
| tree | b5cbd6adeb000fda47fc7fe41e96e27bebd8c4fa /pkg | |
| parent | bf0a1af0cb1b62ec9bd0c6a11544d7f2d76ceee7 (diff) | |
pkg/report: fix gvisor segv reports
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/report/gvisor.go | 12 | ||||
| -rw-r--r-- | pkg/report/testdata/gvisor/report/12 | 18 |
2 files changed, 24 insertions, 6 deletions
diff --git a/pkg/report/gvisor.go b/pkg/report/gvisor.go index f690db285..488a40dad 100644 --- a/pkg/report/gvisor.go +++ b/pkg/report/gvisor.go @@ -150,22 +150,22 @@ var gvisorOopses = []*oops{ []*regexp.Regexp{}, }, &oops{ - []byte("signal SIGSEGV"), + []byte("SIGSEGV:"), []oopsFormat{ { - title: compile("signal SIGSEGV(.*)"), - fmt: "signal SIGSEGV%[1]v", + title: compile("SIGSEGV:(.*)"), + fmt: "SIGSEGV:%[1]v", noStackTrace: true, }, }, []*regexp.Regexp{}, }, &oops{ - []byte("signal SIGBUS"), + []byte("SIGBUS:"), []oopsFormat{ { - title: compile("signal SIGBUS(.*)"), - fmt: "signal SIGBUS%[1]v", + title: compile("SIGBUS:(.*)"), + fmt: "SIGBUS:%[1]v", noStackTrace: true, }, }, diff --git a/pkg/report/testdata/gvisor/report/12 b/pkg/report/testdata/gvisor/report/12 new file mode 100644 index 000000000..4665f9332 --- /dev/null +++ b/pkg/report/testdata/gvisor/report/12 @@ -0,0 +1,18 @@ +TITLE: SIGSEGV: segmentation violation + +SIGSEGV: segmentation violation +PC=0x881300 m=79 sigcode=128 + +goroutine 81531 [syscall, locked to thread]: +gvisor.googlesource.com/gvisor/pkg/sentry/platform/kvm.(*vCPU).SwitchToUser(0xc42082e000, 0xc4208d4fc0, 0xc4220f8600, 0xc522383fb0, 0x100000001, 0xfffffffda0bfa001, 0x13ffda0bfa000, 0x420, 0xc4208a4e98) + pkg/sentry/platform/kvm/machine_amd64.go:210 +0xc1 fp=0xc4208e1d50 sp=0xc4208e1cd8 pc=0x88ebf1 +gvisor.googlesource.com/gvisor/pkg/sentry/platform/kvm.(*context).Switch(0xc421facfc0, 0xc73d60, 0xc522494000, 0xc798a0, 0xc4208d4fc0, 0xffffffff, 0xc4208a4de0, 0x410e9c, 0xc4208a4e40, 0xc4208e1f78) + pkg/sentry/platform/kvm/context.go:68 +0x1ed fp=0xc4208e1e10 sp=0xc4208e1d50 pc=0x88440d +gvisor.googlesource.com/gvisor/pkg/sentry/kernel.(*runApp).execute(0x0, 0xc4220fd200, 0xc679a0, 0x0) + pkg/sentry/kernel/task_run.go:207 +0x17d fp=0xc4208e1f88 sp=0xc4208e1e10 pc=0x70d19d +gvisor.googlesource.com/gvisor/pkg/sentry/kernel.(*Task).run(0xc4220fd200, 0x9c1) + pkg/sentry/kernel/task_run.go:95 +0x174 fp=0xc4208e1fd0 sp=0xc4208e1f88 pc=0x70ccb4 +runtime.goexit() + bazel-out/k8-fastbuild/bin/external/io_bazel_rules_go/linux_amd64_pure_stripped/stdlib~/src/runtime/asm_amd64.s:2361 +0x1 fp=0xc4208e1fd8 sp=0xc4208e1fd0 pc=0x455f11 +created by gvisor.googlesource.com/gvisor/pkg/sentry/kernel.(*Task).Start + pkg/sentry/kernel/task_start.go:251 +0x100 |