Merge pull request opencontainers#1895 from giuseppe/fix-tty-hang

Mrunal Patel · web-flow · commit 00dc70017d22 · 2018-09-20T10:02:08.000-07:00
tty: close epollConsole on errors
diff --git a/tty.go b/tty.go
@@ -97,9 +97,11 @@ func (t *tty) recvtty(process *libcontainer.Process, socket *os.File) error {
 	// set raw mode to stdin and also handle interrupt
 	stdin, err := console.ConsoleFromFile(os.Stdin)
 	if err != nil {
+		epollConsole.Close()
 		return err
 	}
 	if err := stdin.SetRaw(); err != nil {
+		epollConsole.Close()
 		return fmt.Errorf("failed to set the terminal from the stdin: %v", err)
 	}
 	go handleInterrupt(stdin)

Original file line number	Diff line number	Diff line change
`@@ -97,9 +97,11 @@ func (t tty) recvtty(process libcontainer.Process, socket *os.File) error {`
`97`	`97`	`// set raw mode to stdin and also handle interrupt`
`98`	`98`	`stdin, err := console.ConsoleFromFile(os.Stdin)`
`99`	`99`	`if err != nil {`
	`100`	`+ epollConsole.Close()`
`100`	`101`	`return err`
`101`	`102`	`}`
`102`	`103`	`if err := stdin.SetRaw(); err != nil {`
	`104`	`+ epollConsole.Close()`
`103`	`105`	`return fmt.Errorf("failed to set the terminal from the stdin: %v", err)`
`104`	`106`	`}`
`105`	`107`	`go handleInterrupt(stdin)`