From e16e2c9a4cb6937323e861b646792a6c4c978a3c Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 4 Jun 2024 12:55:41 +0200 Subject: executor: add runner mode Move all syz-fuzzer logic into syz-executor and remove syz-fuzzer. Also restore syz-runtest functionality in the manager. Update #4917 (sets most signal handlers to SIG_IGN) --- pkg/mgrconfig/load.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'pkg/mgrconfig') diff --git a/pkg/mgrconfig/load.go b/pkg/mgrconfig/load.go index 2bccdc7df..ba446ffa3 100644 --- a/pkg/mgrconfig/load.go +++ b/pkg/mgrconfig/load.go @@ -29,7 +29,6 @@ type Derived struct { TargetVMArch string // Full paths to binaries we are going to use: - FuzzerBin string ExecprogBin string ExecutorBin string @@ -39,7 +38,7 @@ type Derived struct { // Special debugging/development mode specified by VM type "none". // In this mode syz-manager does not start any VMs, but instead a user is supposed - // to start syz-fuzzer process in a VM manually. + // to start syz-executor process in a VM manually. VMLess bool } @@ -263,16 +262,12 @@ func (cfg *Config) completeBinaries() error { targetBin := func(name, arch string) string { return filepath.Join(cfg.Syzkaller, "bin", cfg.TargetOS+"_"+arch, name+exe) } - cfg.FuzzerBin = targetBin("syz-fuzzer", cfg.TargetVMArch) cfg.ExecprogBin = targetBin("syz-execprog", cfg.TargetVMArch) cfg.ExecutorBin = targetBin("syz-executor", cfg.TargetArch) // If the target already provides an executor binary, we don't need to copy it. if cfg.SysTarget.ExecutorBin != "" { cfg.ExecutorBin = "" } - if !osutil.IsExist(cfg.FuzzerBin) { - return fmt.Errorf("bad config syzkaller param: can't find %v", cfg.FuzzerBin) - } if !osutil.IsExist(cfg.ExecprogBin) { return fmt.Errorf("bad config syzkaller param: can't find %v", cfg.ExecprogBin) } -- cgit mrf-deployment