diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syz-crush/crush.go | 13 | ||||
| -rw-r--r-- | tools/syz-execprog/execprog.go | 3 | ||||
| -rw-r--r-- | tools/syz-hubtool/hubtool.go | 2 | ||||
| -rw-r--r-- | tools/syz-runtest/runtest.go | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/tools/syz-crush/crush.go b/tools/syz-crush/crush.go index 004ebd3fa..5b2dcfffd 100644 --- a/tools/syz-crush/crush.go +++ b/tools/syz-crush/crush.go @@ -23,14 +23,13 @@ import ( "github.com/google/syzkaller/pkg/mgrconfig" "github.com/google/syzkaller/pkg/osutil" "github.com/google/syzkaller/pkg/report" - "github.com/google/syzkaller/prog" "github.com/google/syzkaller/vm" ) var ( flagConfig = flag.String("config", "", "manager configuration file") flagDebug = flag.Bool("debug", false, "dump all VM output to console") - flagRestartTime = flag.Duration("restart_time", time.Hour, "how long to run the test") + flagRestartTime = flag.Duration("restart_time", 0, "how long to run the test") flagInfinite = flag.Bool("infinite", true, "by default test is run for ever, -infinite=false to stop on crash") ) @@ -52,7 +51,9 @@ func main() { if err != nil { log.Fatal(err) } - + if *flagRestartTime == 0 { + *flagRestartTime *= cfg.Timeouts.VMRunningTime + } if *flagInfinite { log.Printf("running infinitely and restarting VM every %v", *flagRestartTime) } else { @@ -101,7 +102,7 @@ func main() { for i := 0; i < vmPool.Count(); i++ { go func(index int) { for { - runDone <- runInstance(cfg.Target, cfg, reporter, vmPool, index, *flagRestartTime, runType) + runDone <- runInstance(cfg, reporter, vmPool, index, *flagRestartTime, runType) if atomic.LoadUint32(&shutdown) != 0 || !*flagInfinite { // If this is the last worker then we can close the channel. if atomic.AddUint32(&stoppedWorkers, 1) == uint32(vmPool.Count()) { @@ -165,7 +166,7 @@ func storeCrash(cfg *mgrconfig.Config, rep *report.Report) { } } -func runInstance(target *prog.Target, cfg *mgrconfig.Config, reporter report.Reporter, +func runInstance(cfg *mgrconfig.Config, reporter report.Reporter, vmPool *vm.Pool, index int, timeout time.Duration, runType FileType) *report.Report { log.Printf("vm-%v: starting", index) inst, err := vmPool.Create(index) @@ -200,7 +201,7 @@ func runInstance(target *prog.Target, cfg *mgrconfig.Config, reporter report.Rep } cmd = instance.ExecprogCmd(execprogBin, executorBin, cfg.TargetOS, cfg.TargetArch, cfg.Sandbox, - true, true, true, cfg.Procs, -1, -1, logFile) + true, true, true, cfg.Procs, -1, -1, true, cfg.Timeouts.Slowdown, logFile) } else { cmd = execprogBin } diff --git a/tools/syz-execprog/execprog.go b/tools/syz-execprog/execprog.go index c24a515ca..50879e6f6 100644 --- a/tools/syz-execprog/execprog.go +++ b/tools/syz-execprog/execprog.go @@ -283,8 +283,7 @@ func loadPrograms(target *prog.Target, files []string) []*prog.LogEntry { return entries } -func createConfig(target *prog.Target, - features *host.Features, featuresFlags csource.Features) ( +func createConfig(target *prog.Target, features *host.Features, featuresFlags csource.Features) ( *ipc.Config, *ipc.ExecOpts) { config, execOpts, err := ipcconfig.Default(target) if err != nil { diff --git a/tools/syz-hubtool/hubtool.go b/tools/syz-hubtool/hubtool.go index bf5f6c20b..491191a4c 100644 --- a/tools/syz-hubtool/hubtool.go +++ b/tools/syz-hubtool/hubtool.go @@ -51,7 +51,7 @@ func main() { return } log.Printf("connecting to hub at %v...", *flagHubAddress) - conn, err := rpctype.NewRPCClient(*flagHubAddress) + conn, err := rpctype.NewRPCClient(*flagHubAddress, 1) if err != nil { log.Fatalf("failed to connect to hub: %v", err) } diff --git a/tools/syz-runtest/runtest.go b/tools/syz-runtest/runtest.go index 55e07d58c..8ef15af38 100644 --- a/tools/syz-runtest/runtest.go +++ b/tools/syz-runtest/runtest.go @@ -175,7 +175,7 @@ func (mgr *Manager) boot(name string, index int) (*report.Report, error) { } cmd := instance.FuzzerCmd(fuzzerBin, executorBin, name, mgr.cfg.TargetOS, mgr.cfg.TargetArch, fwdAddr, mgr.cfg.Sandbox, mgr.cfg.Procs, 0, - mgr.cfg.Cover, mgr.debug, false, true) + mgr.cfg.Cover, mgr.debug, false, true, true, mgr.cfg.Timeouts.Slowdown) outc, errc, err := inst.Run(time.Hour, mgr.vmStop, cmd) if err != nil { return nil, fmt.Errorf("failed to run fuzzer: %v", err) |