diff options
| author | Nicolas Lacasse <nlacasse@google.com> | 2018-10-03 10:31:01 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-10-03 10:32:03 -0700 |
| commit | e215b9970ad82915a8d544b81b3c49d7d84a0eb0 (patch) | |
| tree | ca7fafed97a41307243ab7fc84d0a19e285dee53 /runsc/console | |
| parent | 77e43adeab4abcd301d76222e0304f551fbcf0cc (diff) | |
runsc: Pass root container's stdio via FD.
We were previously using the sandbox process's stdio as the root container's
stdio. This makes it difficult/impossible to distinguish output application
output from sandbox output, such as panics, which are always written to stderr.
Also close the console socket when we are done with it.
PiperOrigin-RevId: 215585180
Change-Id: I980b8c69bd61a8b8e0a496fd7bc90a06446764e0
Diffstat (limited to 'runsc/console')
| -rw-r--r-- | runsc/console/console.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runsc/console/console.go b/runsc/console/console.go index 2f2745b2b..3df184742 100644 --- a/runsc/console/console.go +++ b/runsc/console/console.go @@ -40,6 +40,7 @@ func NewWithSocket(socketPath string) (*os.File, error) { ptySlave.Close() return nil, fmt.Errorf("error dial socket %q: %v", socketPath, err) } + defer conn.Close() uc, ok := conn.(*net.UnixConn) if !ok { ptySlave.Close() @@ -50,6 +51,7 @@ func NewWithSocket(socketPath string) (*os.File, error) { ptySlave.Close() return nil, fmt.Errorf("error getting file for unix socket %v: %v", uc, err) } + defer socket.Close() // Send the master FD over the connection. msg := unix.UnixRights(int(ptyMaster.Fd())) |