From f9f0e027d84992a3bcd0e2f348f85e9ad707a5a5 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Wed, 19 Jul 2017 17:32:48 +0200 Subject: syz-manager: fix repro log filename --- syz-manager/html.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syz-manager/html.go b/syz-manager/html.go index befcffc7e..d683be10b 100644 --- a/syz-manager/html.go +++ b/syz-manager/html.go @@ -253,7 +253,7 @@ func (mgr *Manager) httpReport(w http.ResponseWriter, r *http.Request) { prog, _ := ioutil.ReadFile(filepath.Join(mgr.crashdir, crashID, "repro.prog")) cprog, _ := ioutil.ReadFile(filepath.Join(mgr.crashdir, crashID, "repro.cprog")) rep, _ := ioutil.ReadFile(filepath.Join(mgr.crashdir, crashID, "repro.report")) - log, _ := ioutil.ReadFile(filepath.Join(mgr.crashdir, crashID, "repro.log")) + log, _ := ioutil.ReadFile(filepath.Join(mgr.crashdir, crashID, "repro.stats.log")) stats, _ := ioutil.ReadFile(filepath.Join(mgr.crashdir, crashID, "repro.stats")) fmt.Fprintf(w, "Syzkaller hit '%s' bug on commit %s.\n\n", trimNewLines(desc), trimNewLines(tag)) -- cgit mrf-deployment From d1e3265562438e4bd6c4a5d3d70ed336356ed5c3 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Wed, 19 Jul 2017 17:35:40 +0200 Subject: syz-manager: don't print empty tag on report page --- syz-manager/html.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/syz-manager/html.go b/syz-manager/html.go index d683be10b..1d3ba0bfb 100644 --- a/syz-manager/html.go +++ b/syz-manager/html.go @@ -256,11 +256,15 @@ func (mgr *Manager) httpReport(w http.ResponseWriter, r *http.Request) { log, _ := ioutil.ReadFile(filepath.Join(mgr.crashdir, crashID, "repro.stats.log")) stats, _ := ioutil.ReadFile(filepath.Join(mgr.crashdir, crashID, "repro.stats")) - fmt.Fprintf(w, "Syzkaller hit '%s' bug on commit %s.\n\n", trimNewLines(desc), trimNewLines(tag)) + commitDesc := "" + if len(tag) != 0 { + commitDesc = fmt.Sprintf(" on commit %s.", trimNewLines(tag)) + } + fmt.Fprintf(w, "Syzkaller hit '%s' bug%s.\n\n", trimNewLines(desc), commitDesc) if len(rep) != 0 { guiltyFile := report.ExtractGuiltyFile(rep) if guiltyFile != "" { - fmt.Fprintf(w, "The guilty file is: %v.\n\n", guiltyFile) + fmt.Fprintf(w, "Guilty file: %v\n\n", guiltyFile) maintainers, err := report.GetMaintainers(mgr.cfg.Kernel_Src, guiltyFile) if err == nil { fmt.Fprintf(w, "Maintainers: %v\n\n", maintainers) -- cgit mrf-deployment