diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2022-06-20 12:55:23 +0000 |
|---|---|---|
| committer | Aleksandr Nogikh <wp32pw@gmail.com> | 2022-06-20 15:24:18 +0200 |
| commit | 8d15e28d598508dc8a6007d0cdf76b48d8cf8ba0 (patch) | |
| tree | 2d3bbd4e29532226217b8336f1a6cb8f0c683a87 /pkg/instance | |
| parent | b9406563d876e5550ab7e93cd0d559758b8352ca (diff) | |
pkg/instance: don't close vmInst in SetupExecProg
That method was not assumed to take ownership of the instance. This
can lead to double-closing of it during bisection/patch testing, and
therefore to panic().
Closes #3210.
Diffstat (limited to 'pkg/instance')
| -rw-r--r-- | pkg/instance/execprog.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkg/instance/execprog.go b/pkg/instance/execprog.go index f6f9bfa01..1fa01b620 100644 --- a/pkg/instance/execprog.go +++ b/pkg/instance/execprog.go @@ -44,14 +44,12 @@ func SetupExecProg(vmInst *vm.Instance, mgrCfg *mgrconfig.Config, reporter *repo opt *OptionalConfig) (*ExecProgInstance, error) { execprogBin, err := vmInst.Copy(mgrCfg.ExecprogBin) if err != nil { - vmInst.Close() return nil, &TestError{Title: fmt.Sprintf("failed to copy syz-execprog to VM: %v", err)} } executorBin := mgrCfg.SysTarget.ExecutorBin if executorBin == "" { executorBin, err = vmInst.Copy(mgrCfg.ExecutorBin) if err != nil { - vmInst.Close() return nil, &TestError{Title: fmt.Sprintf("failed to copy syz-executor to VM: %v", err)} } } @@ -68,7 +66,6 @@ func SetupExecProg(vmInst *vm.Instance, mgrCfg *mgrconfig.Config, reporter *repo var err error ret.StraceBin, err = vmInst.Copy(ret.StraceBin) if err != nil { - vmInst.Close() return nil, &TestError{Title: fmt.Sprintf("failed to copy strace bin: %v", err)} } } |