From d0b7645387ebebc6a4eb298e1905f5ac8f60688f Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 26 Apr 2018 14:46:16 +0200 Subject: pkg/report: few report parsing fixes for linux --- pkg/report/linux.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/report/linux.go') diff --git a/pkg/report/linux.go b/pkg/report/linux.go index 6e2e32875..e5b71486e 100644 --- a/pkg/report/linux.go +++ b/pkg/report/linux.go @@ -509,7 +509,7 @@ var ( executorBinRe = regexp.MustCompile(`syz-executor[0-9]+((/|:)[0-9]+)?`) syzkallerBinRe = regexp.MustCompile(`syzkaller[0-9]+((/|:)[0-9]+)?`) linuxRcuStall = compile("INFO: rcu_(?:preempt|sched|bh) (?:self-)?detected(?: expedited)? stall") - linuxRipFrame = compile("IP: (?:(?:[0-9]+:)?(?:{{PC}} +){0,2}{{FUNC}}|[0-9]+:0x[0-9a-f]+)") + linuxRipFrame = compile(`IP: (?:(?:[0-9]+:)?(?:{{PC}} +){0,2}{{FUNC}}|[0-9]+:0x[0-9a-f]+|(?:[0-9]+:)?{{PC}} +\[< *\(null\)>\] +\(null\))`) ) var linuxCorruptedTitles = []*regexp.Regexp{ @@ -974,7 +974,7 @@ var linuxOopses = []*oops{ }, { title: compile("INFO: suspicious RCU usage"), - report: compile("INFO: suspicious RCU usage(?:.*\n)+?.*?:{{SRC}}"), + report: compile("INFO: suspicious RCU usage(?:.*\n)+?.*?{{SRC}}"), fmt: "INFO: suspicious RCU usage in %[2]v", stack: &stackFmt{ parts: []*regexp.Regexp{ -- cgit mrf-deployment