OSSInnovation
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tty: close epollConsole on errors 

make sure epollConsole is closed before returning an error.  It solves
a hang when using these commands with a container that uses a
terminal:

runc run foo &
ssh root@localhost runc exec foo echo hello

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2018-09-20 16:51:08 +02:00
parent fdd8055cdd
commit ec0d23a92f
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tty.go
View File

@ -97,9 +97,11 @@ func (t *tty) recvtty(process *libcontainer.Process, socket *os.File) error {
// set raw mode to stdin and also handle interrupt // set raw mode to stdin and also handle interrupt
stdin, err := console.ConsoleFromFile(os.Stdin) stdin, err := console.ConsoleFromFile(os.Stdin)
if err != nil { if err != nil {
epollConsole.Close()
return err return err
} }
if err := stdin.SetRaw(); err != nil { if err := stdin.SetRaw(); err != nil {
epollConsole.Close()
return fmt.Errorf("failed to set the terminal from the stdin: %v", err) return fmt.Errorf("failed to set the terminal from the stdin: %v", err)
} }
go handleInterrupt(stdin) go handleInterrupt(stdin)