From 9724efa3358566378773cef6e72026f89c007930 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 16 Feb 2016 15:14:25 +0100 Subject: config: check presence of syz-execprog only in syz-repro syz-execprog is not built by 'make', so syz-manager fails for first-timers. --- config/config.go | 3 --- tools/syz-repro/repro.go | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/config.go b/config/config.go index d1109757c..f648795c1 100644 --- a/config/config.go +++ b/config/config.go @@ -68,9 +68,6 @@ func Parse(filename string) (*Config, map[int]bool, []*regexp.Regexp, error) { if _, err := os.Stat(filepath.Join(cfg.Syzkaller, "bin/syz-executor")); err != nil { return nil, nil, nil, fmt.Errorf("bad config syzkaller param: can't find bin/syz-executor") } - if _, err := os.Stat(filepath.Join(cfg.Syzkaller, "bin/syz-execprog")); err != nil { - return nil, nil, nil, fmt.Errorf("bad config syzkaller param: can't find bin/syz-execprog") - } if cfg.Http == "" { return nil, nil, nil, fmt.Errorf("config param http is empty") } diff --git a/tools/syz-repro/repro.go b/tools/syz-repro/repro.go index a74791f62..ade3852ee 100644 --- a/tools/syz-repro/repro.go +++ b/tools/syz-repro/repro.go @@ -46,6 +46,9 @@ func main() { if *flagCount > 0 { cfg.Count = *flagCount } + if _, err := os.Stat(filepath.Join(cfg.Syzkaller, "bin/syz-execprog")); err != nil { + log.Fatalf("bin/syz-execprog is missing (run 'make execprog')") + } if len(flag.Args()) != 1 { log.Fatalf("usage: syz-repro -config=config.file execution.log") -- cgit mrf-deployment