diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2022-01-03 20:42:20 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2022-01-04 15:21:22 +0100 |
| commit | e58c419b6b84dece123a22f9a6b6824e54e83c3d (patch) | |
| tree | 8ea153ce1efccce1147894a171bcc5326c6cb0c7 /pkg | |
| parent | 797fbea834e1ff011ff358ae50f62c3bd22e1643 (diff) | |
pkg/report: repair parsing of KMSAN kernel-usb-infoleak
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/report/linux.go | 5 | ||||
| -rw-r--r-- | pkg/report/testdata/linux/report/637 | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkg/report/linux.go b/pkg/report/linux.go index 7ae8a59ce..5ea3e9619 100644 --- a/pkg/report/linux.go +++ b/pkg/report/linux.go @@ -1257,11 +1257,16 @@ var linuxOopses = append([]*oops{ fmt: "KMSAN: kernel-usb-infoleak in %[2]v", stack: &stackFmt{ parts: []*regexp.Regexp{ + parseStackTrace, + }, + parts2: []*regexp.Regexp{ + // For backwards compatibility - KMSAN used to include the Call Trace line. linuxCallTrace, parseStackTrace, }, skip: []string{"usb_submit_urb", "usb_start_wait_urb", "usb_bulk_msg", "usb_interrupt_msg", "usb_control_msg"}, }, + noStackTrace: true, }, { title: compile("BUG: KMSAN:"), diff --git a/pkg/report/testdata/linux/report/637 b/pkg/report/testdata/linux/report/637 index 262e822c8..66eb2a48c 100644 --- a/pkg/report/testdata/linux/report/637 +++ b/pkg/report/testdata/linux/report/637 @@ -1,5 +1,4 @@ -TITLE: KMSAN: kernel-usb-infoleak in corrupted -CORRUPTED: Y +TITLE: KMSAN: kernel-usb-infoleak in hif_usb_send [ 180.463142][ T3569] ===================================================== [ 180.470227][ T3569] BUG: KMSAN: kernel-usb-infoleak in usb_submit_urb+0x6c1/0x2aa0 |