From c9005dd1d5ffd01061f834bceee808b3743ccbdf Mon Sep 17 00:00:00 2001
From: Qiang Huang <h.huangqiang@huawei.com>
Date: Thu, 26 Jan 2017 09:02:00 +0800
Subject: [PATCH] Call defer tty.Close() earlier

We could fail and return in tty.recvtty() and miss
tty.Close(), which might cause broken console output.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
---
 utils_linux.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils_linux.go b/utils_linux.go
index fe617c711..867c2d7ad 100644
--- a/utils_linux.go
+++ b/utils_linux.go
@@ -239,6 +239,7 @@ func (r *runner) run(config *specs.Process) (int, error) {
 		r.destroy()
 		return -1, err
 	}
+	defer tty.Close()
 	if err = startFn(process); err != nil {
 		r.destroy()
 		return -1, err
@@ -250,7 +251,6 @@ func (r *runner) run(config *specs.Process) (int, error) {
 			return -1, err
 		}
 	}
-	defer tty.Close()
 
 	if config.Terminal && detach {
 		conn, err := net.Dial("unix", r.consoleSocket)