From 1b3ae9a6d0f41849f8a4c9ee7b0b244fc011d117 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 12 Dec 2017 13:29:45 +0100 Subject: pkg/report: handle syzkaller binaries syzkallerNNN binaries are coming from pkg/repro. --- pkg/report/linux.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pkg/report/linux.go') diff --git a/pkg/report/linux.go b/pkg/report/linux.go index 3e53488a2..a672545de 100644 --- a/pkg/report/linux.go +++ b/pkg/report/linux.go @@ -188,7 +188,9 @@ func (ctx *linux) Parse(output []byte) *Report { rep.Report = append(rep.Report, report...) rep.Corrupted = ctx.isCorrupted(title, report, format) // Executor PIDs are not interesting. - rep.Title = executorRe.ReplaceAllLiteralString(rep.Title, "syz-executor") + rep.Title = executorBinRe.ReplaceAllLiteralString(rep.Title, "syz-executor") + // syzkaller binaries are coming from repro. + rep.Title = syzkallerBinRe.ReplaceAllLiteralString(rep.Title, "syzkaller") // Replace that everything looks like an address with "ADDR", // addresses in descriptions can't be good regardless of the oops regexps. rep.Title = addrRe.ReplaceAllString(rep.Title, "${1}ADDR") @@ -428,7 +430,8 @@ var ( decNumRe = regexp.MustCompile(`([^a-zA-Z])[0-9]{5,}`) funcRe = regexp.MustCompile(`([a-zA-Z][a-zA-Z0-9_.]+)\+0x[0-9a-z]+/0x[0-9a-z]+`) cpuRe = regexp.MustCompile(`CPU#[0-9]+`) - executorRe = regexp.MustCompile(`syz-executor[0-9]+((/|:)[0-9]+)?`) + executorBinRe = regexp.MustCompile(`syz-executor[0-9]+((/|:)[0-9]+)?`) + syzkallerBinRe = regexp.MustCompile(`syzkaller[0-9]+((/|:)[0-9]+)?`) ) var linuxCorruptedTitles = []*regexp.Regexp{ -- cgit mrf-deployment