diff options
| -rw-r--r-- | syz-gce/syz-gce.go | 1 | ||||
| -rw-r--r-- | syz-manager/manager.go | 4 | ||||
| -rw-r--r-- | syz-manager/mgrconfig/mgrconfig.go | 7 |
3 files changed, 2 insertions, 10 deletions
diff --git a/syz-gce/syz-gce.go b/syz-gce/syz-gce.go index 7e1fd68b3..f6a9fae1b 100644 --- a/syz-gce/syz-gce.go +++ b/syz-gce/syz-gce.go @@ -480,7 +480,6 @@ func writeManagerConfig(cfg *Config, httpPort int, file string) error { Syzkaller: "gopath/src/github.com/google/syzkaller", Type: "gce", Image: "image/disk.tar.gz", - Output: "stdout", Sandbox: cfg.Sandbox, Procs: cfg.Procs, Enable_Syscalls: cfg.Enable_Syscalls, diff --git a/syz-manager/manager.go b/syz-manager/manager.go index 9ab0ce4f5..465cf7aad 100644 --- a/syz-manager/manager.go +++ b/syz-manager/manager.go @@ -478,8 +478,8 @@ func (mgr *Manager) runInstance(index int) (*Crash, error) { start := time.Now() atomic.AddUint32(&mgr.numFuzzing, 1) defer atomic.AddUint32(&mgr.numFuzzing, ^uint32(0)) - cmd := fmt.Sprintf("%v -executor=%v -name=vm-%v -manager=%v -output=%v -procs=%v -leak=%v -cover=%v -sandbox=%v -debug=%v -v=%d", - fuzzerBin, executorBin, index, fwdAddr, mgr.cfg.Output, procs, leak, mgr.cfg.Cover, mgr.cfg.Sandbox, *flagDebug, fuzzerV) + cmd := fmt.Sprintf("%v -executor=%v -name=vm-%v -manager=%v -procs=%v -leak=%v -cover=%v -sandbox=%v -debug=%v -v=%d", + fuzzerBin, executorBin, index, fwdAddr, procs, leak, mgr.cfg.Cover, mgr.cfg.Sandbox, *flagDebug, fuzzerV) outc, errc, err := inst.Run(time.Hour, mgr.vmStop, cmd) if err != nil { return nil, fmt.Errorf("failed to run fuzzer: %v", err) diff --git a/syz-manager/mgrconfig/mgrconfig.go b/syz-manager/mgrconfig/mgrconfig.go index 66c5caf90..ace794d97 100644 --- a/syz-manager/mgrconfig/mgrconfig.go +++ b/syz-manager/mgrconfig/mgrconfig.go @@ -23,7 +23,6 @@ type Config struct { Vmlinux string Tag string // arbitrary optional tag that is saved along with crash reports (e.g. branch/commit) Image string // linux image for VMs - Output string // one of stdout/dmesg/file (useful only for local VM) Hub_Addr string Hub_Key string @@ -71,7 +70,6 @@ func load(data []byte, filename string) (*Config, map[int]bool, error) { Reproduce: true, Sandbox: "setuid", Rpc: "localhost:0", - Output: "stdout", Procs: 1, } if data != nil { @@ -107,11 +105,6 @@ func load(data []byte, filename string) (*Config, map[int]bool, error) { if cfg.Procs < 1 || cfg.Procs > 32 { return nil, nil, fmt.Errorf("bad config param procs: '%v', want [1, 32]", cfg.Procs) } - switch cfg.Output { - case "none", "stdout", "dmesg", "file": - default: - return nil, nil, fmt.Errorf("config param output must contain one of none/stdout/dmesg/file") - } switch cfg.Sandbox { case "none", "setuid", "namespace": default: |