From b5866354b986ff8955bba8e66a4a6aa42a279af0 Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Tue, 19 Apr 2022 08:56:14 +0000 Subject: all: fix patch testing for bugs witout C repro Syzbot tests patches with -collide=true in order to trigger more bugs, but now that -collide flag is deprecated, this no longer makes sense. Moreover, it actually prevents the testing of bugs with syz repro now - syz-execprog immediately exits due to -collide=true and env.Test() accepts it as a normal outcome. Set -collide=true only for those bugs, where collide was set to true by the reproducer (and therefore syzkaller at that revision supported it). Don't exit from syz-execprog immediately if -collide is set to true. This will prevent such bugs from happening later and make the problem more visible. This was initially part of #3083, but seems to be more urgent to merge, so pushing it as a separate PR. --- pkg/instance/instance.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/instance/instance.go') diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go index e670a2c64..a3a87d338 100644 --- a/pkg/instance/instance.go +++ b/pkg/instance/instance.go @@ -398,7 +398,7 @@ func (inst *inst) testRepro() error { opts.FaultCall = -1 } cmdSyz := ExecprogCmd(execprogBin, executorBin, cfg.TargetOS, cfg.TargetArch, opts.Sandbox, - true, true, true, cfg.Procs, opts.FaultCall, opts.FaultNth, inst.optionalFlags, + true, true, opts.Collide, cfg.Procs, opts.FaultCall, opts.FaultNth, inst.optionalFlags, cfg.Timeouts.Slowdown, vmProgFile) if err := inst.testProgram(cmdSyz, cfg.Timeouts.NoOutputRunningTime); err != nil { return err -- cgit mrf-deployment