syz-symbolize: symbolize all console output

Currently syz-symbolize uses report.Parse function
that extracts crash messages from console output.
Symbolize all console output instead.
E.g. there can be something on the console that is not crash.

2 files changed, 25 insertions, 2 deletions

diff --git a/report/report.go b/report/report.go
index 8d1f0f28f..5a8f4a8bd 100644
--- a/report/report.go
+++ b/report/report.go
@@ -408,6 +408,29 @@ func Parse(output []byte, ignores []*regexp.Regexp) (desc string, text []byte, s
 	return
 }
 
+func ExtractConsoleOutput(output []byte) (result []byte) {
+	for pos := 0; pos < len(output); {
+		next := bytes.IndexByte(output[pos:], '\n')
+		if next != -1 {
+			next += pos
+		} else {
+			next = len(output)
+		}
+		if consoleOutputRe.Match(output[pos:next]) &&
+			(!questionableRe.Match(output[pos:next]) || bytes.Index(output[pos:next], eoi) != -1) {
+			lineStart := bytes.Index(output[pos:next], []byte("] ")) + pos + 2
+			lineEnd := next
+			if lineEnd != 0 && output[lineEnd-1] == '\r' {
+				lineEnd--
+			}
+			result = append(result, output[lineStart:lineEnd]...)
+			result = append(result, '\n')
+		}
+		pos = next + 1
+	}
+	return
+}
+
 func matchOops(line []byte, oops *oops, ignores []*regexp.Regexp) int {
 	match := bytes.Index(line, oops.header)
 	if match == -1 {
diff --git a/tools/syz-symbolize/symbolize.go b/tools/syz-symbolize/symbolize.go
index 4e5e8564b..d348b7148 100644
--- a/tools/syz-symbolize/symbolize.go
+++ b/tools/syz-symbolize/symbolize.go
@@ -29,8 +29,8 @@ func main() {
 		fmt.Fprintf(os.Stderr, "failed to open input file: %v\n", err)
 		os.Exit(1)
 	}
-	if _, parsed, _, _ := report.Parse(text, nil); len(parsed) != 0 {
-		text = parsed
+	if console := report.ExtractConsoleOutput(text); len(console) != 0 {
+		text = console
 	}
 	text, err = report.Symbolize(filepath.Join(*flagLinux, "vmlinux"), text)
 	if err != nil {