Merge a8f148b8 (automated)

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++ {