From 441d64d9a559372866815d307bee04b55c9622d1 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 18 Oct 2017 16:48:18 +0200 Subject: [PATCH] syz-manager/mgrconfig: fix selection of executor binary We currently select executor for vm arch, need to select target arch. This breaks linux/amd64/386 configuration where we select amd64 instead of 386. --- syz-manager/mgrconfig/mgrconfig.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/syz-manager/mgrconfig/mgrconfig.go b/syz-manager/mgrconfig/mgrconfig.go index bd568d36..f29951e1 100644 --- a/syz-manager/mgrconfig/mgrconfig.go +++ b/syz-manager/mgrconfig/mgrconfig.go @@ -109,16 +109,16 @@ func load(data []byte, filename string) (*Config, error) { return nil, err } - targetBin := func(name string) string { + targetBin := func(name, arch string) string { exe := "" if cfg.TargetOS == "windows" { exe = ".exe" } - return filepath.Join(cfg.Syzkaller, "bin", cfg.TargetOS+"_"+cfg.TargetVMArch, name+exe) + return filepath.Join(cfg.Syzkaller, "bin", cfg.TargetOS+"_"+arch, name+exe) } - cfg.SyzFuzzerBin = targetBin("syz-fuzzer") - cfg.SyzExecprogBin = targetBin("syz-execprog") - cfg.SyzExecutorBin = targetBin("syz-executor") + cfg.SyzFuzzerBin = targetBin("syz-fuzzer", cfg.TargetVMArch) + cfg.SyzExecprogBin = targetBin("syz-execprog", cfg.TargetVMArch) + cfg.SyzExecutorBin = targetBin("syz-executor", cfg.TargetArch) if !osutil.IsExist(cfg.SyzFuzzerBin) { return nil, fmt.Errorf("bad config syzkaller param: can't find %v", cfg.SyzFuzzerBin) }