From 649477b6a5ae651dbf3c731911b81edd8c9d5fb2 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 3 Aug 2018 18:18:05 +0200 Subject: pkg/ipc: remove abort signal and buffer size They were needed for intermediate gvisor support. Now that we have end-to-end support for gvisor, they are not needed anymore. Remove. --- pkg/ipc/ipcconfig/ipcconfig.go | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'pkg/ipc/ipcconfig') diff --git a/pkg/ipc/ipcconfig/ipcconfig.go b/pkg/ipc/ipcconfig/ipcconfig.go index 6f13ad137..7c74ea94d 100644 --- a/pkg/ipc/ipcconfig/ipcconfig.go +++ b/pkg/ipc/ipcconfig/ipcconfig.go @@ -13,25 +13,19 @@ import ( ) var ( - flagExecutor = flag.String("executor", "./syz-executor", "path to executor binary") - flagThreaded = flag.Bool("threaded", true, "use threaded mode in executor") - flagCollide = flag.Bool("collide", true, "collide syscalls to provoke data races") - flagSignal = flag.Bool("cover", false, "collect feedback signals (coverage)") - flagSandbox = flag.String("sandbox", "none", "sandbox for fuzzing (none/setuid/namespace)") - flagDebug = flag.Bool("debug", false, "debug output from executor") - flagTimeout = flag.Duration("timeout", 0, "execution timeout") - flagAbortSignal = flag.Int("abort_signal", 0, "initial signal to send to executor"+ - " in error conditions; upgrades to SIGKILL if executor does not exit") - flagBufferSize = flag.Uint64("buffer_size", 0, "internal buffer size (in bytes) for executor output") + flagExecutor = flag.String("executor", "./syz-executor", "path to executor binary") + flagThreaded = flag.Bool("threaded", true, "use threaded mode in executor") + flagCollide = flag.Bool("collide", true, "collide syscalls to provoke data races") + flagSignal = flag.Bool("cover", false, "collect feedback signals (coverage)") + flagSandbox = flag.String("sandbox", "none", "sandbox for fuzzing (none/setuid/namespace)") + flagDebug = flag.Bool("debug", false, "debug output from executor") + flagTimeout = flag.Duration("timeout", 0, "execution timeout") ) func Default(target *prog.Target) (*ipc.Config, *ipc.ExecOpts, error) { c := &ipc.Config{ - Executor: *flagExecutor, - Timeout: *flagTimeout, - AbortSignal: *flagAbortSignal, - BufferSize: *flagBufferSize, - RateLimit: target.OS == "akaros", + Executor: *flagExecutor, + Timeout: *flagTimeout, } if *flagSignal { c.Flags |= ipc.FlagSignal -- cgit mrf-deployment