diff options
| author | Nicolas Lacasse <nlacasse@google.com> | 2019-06-25 11:46:19 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-06-25 11:47:27 -0700 |
| commit | a8f148b8e4098eaeb80e1d704b64aab8aeb1294f (patch) | |
| tree | 84e3b913a2c2be598eb89d1a666bacb83abbca11 /runsc/sandbox/sandbox.go | |
| parent | 03ae91c662869a37ba71dd2577d4e218a3aa4669 (diff) | |
Use different Ctty FDs based on the go version.
An upcoming change in Go 1.13 [1] changes the semantics of the SysProcAttr.Ctty
field. Prior to the change, the FD must be an FD in the child process's FD
table (aka "post-shuffle"). After the change, the FD must be an FD in the
current process's FD table (aka "pre-shuffle").
To be compatible with both versions this CL introduces a new boolean
"CttyFdIsPostShuffle" which indicates whether a pre- or post-shuffle FD should
be provided. We use build tags to chose the correct one.
1: https://go-review.googlesource.com/c/go/+/178919/
PiperOrigin-RevId: 255015303
Diffstat (limited to 'runsc/sandbox/sandbox.go')
| -rw-r--r-- | runsc/sandbox/sandbox.go | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/runsc/sandbox/sandbox.go b/runsc/sandbox/sandbox.go index 52a5dfd77..1591052cd 100644 --- a/runsc/sandbox/sandbox.go +++ b/runsc/sandbox/sandbox.go @@ -437,11 +437,16 @@ func (s *Sandbox) createSandboxProcess(conf *boot.Config, args *Args, startSyncF defer tty.Close() // Set the TTY as a controlling TTY on the sandbox process. - // Note that the Ctty field must be the FD of the TTY in the - // *new* process, not this process. Since we are about to - // assign the TTY to nextFD, we can use that value here. cmd.SysProcAttr.Setctty = true - cmd.SysProcAttr.Ctty = nextFD + cmd.SysProcAttr.Ctty = int(tty.Fd()) + // TODO(b/133868570): Delete this check once Go 1.12 is no + // longer supported. + if console.CttyFdIsPostShuffle { + // In go1.12 and before, the Ctty FD must be the FD in + // the child process's FD table, which will be "nextFD" + // in this case. + cmd.SysProcAttr.Ctty = nextFD + } // Pass the tty as all stdio fds to sandbox. for i := 0; i < 3; i++ { |