From eddaedbb9c8d4f64ad1d91afa2d84cb43377c9d0 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 30 Nov 2017 10:20:34 +0100 Subject: tools/syz-crush: fix for new multi-target world --- tools/syz-crush/crush.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/syz-crush/crush.go b/tools/syz-crush/crush.go index ca92f8cd1..8811d4f4a 100644 --- a/tools/syz-crush/crush.go +++ b/tools/syz-crush/crush.go @@ -44,7 +44,8 @@ func main() { if err != nil { log.Fatalf("%v", err) } - reporter, err := report.NewReporter(cfg.TargetOS, cfg.Kernel_Src, "", nil, cfg.ParsedIgnores) + reporter, err := report.NewReporter(cfg.TargetOS, cfg.Kernel_Src, + filepath.Dir(cfg.Vmlinux), nil, cfg.ParsedIgnores) if err != nil { log.Fatalf("%v", err) } @@ -84,12 +85,12 @@ func runInstance(cfg *mgrconfig.Config, reporter report.Reporter, vmPool *vm.Poo } defer inst.Close() - execprogBin, err := inst.Copy(filepath.Join(cfg.Syzkaller, "bin", "syz-execprog")) + execprogBin, err := inst.Copy(cfg.SyzExecprogBin) if err != nil { log.Logf(0, "failed to copy execprog: %v", err) return } - executorBin, err := inst.Copy(filepath.Join(cfg.Syzkaller, "bin", "syz-executor")) + executorBin, err := inst.Copy(cfg.SyzExecutorBin) if err != nil { log.Logf(0, "failed to copy executor: %v", err) return -- cgit mrf-deployment