diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2024-06-24 14:27:07 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2024-06-24 15:05:22 +0000 |
| commit | 215eef4ad85fb6124af70d1e5c9729b69554a32b (patch) | |
| tree | 72c63a1257a13cee00737fbb76d71d72215c940d /syz-manager/manager.go | |
| parent | 0c0f0b4b3be7a004ae46afe61a8f5e3ad2469e71 (diff) | |
syz-manager: support stdin as port forwarding result
It is returned from vm/gvisor.
Diffstat (limited to 'syz-manager/manager.go')
| -rw-r--r-- | syz-manager/manager.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/syz-manager/manager.go b/syz-manager/manager.go index d396bedb3..fe5af4d12 100644 --- a/syz-manager/manager.go +++ b/syz-manager/manager.go @@ -905,8 +905,12 @@ func (mgr *Manager) runInstanceInner(index int, instanceName string, injectExec mgr.bootTime.Save(time.Since(start)) start = time.Now() - addrPort := strings.Split(fwdAddr, ":") - cmd := fmt.Sprintf("%v runner %v %v %v", executorBin, instanceName, addrPort[0], addrPort[1]) + addr := fwdAddr + if strings.Contains(fwdAddr, ":") { + addrPort := strings.Split(fwdAddr, ":") + addr = fmt.Sprintf("%v %v", addrPort[0], addrPort[1]) + } + cmd := fmt.Sprintf("%v runner %v %v", executorBin, instanceName, addr) _, rep, err := inst.Run(mgr.cfg.Timeouts.VMRunningTime, mgr.reporter, cmd, vm.ExitTimeout, vm.StopChan(mgr.vmStop), vm.InjectExecuting(injectExec), vm.EarlyFinishCb(func() { |