diff options
| -rw-r--r-- | libpod/oci_attach_linux.go | 4 | ||||
| -rw-r--r-- | libpod/oci_internal_linux.go | 11 | ||||
| -rw-r--r-- | pkg/adapter/terminal_linux.go | 8 |
3 files changed, 16 insertions, 7 deletions
diff --git a/libpod/oci_attach_linux.go b/libpod/oci_attach_linux.go index 7157ee2f7..22afa7416 100644 --- a/libpod/oci_attach_linux.go +++ b/libpod/oci_attach_linux.go @@ -188,7 +188,9 @@ func setupStdioChannels(streams *AttachStreams, conn *net.UnixConn, detachKeys [ var err error if streams.AttachInput { _, err = utils.CopyDetachable(conn, streams.InputStream, detachKeys) - conn.CloseWrite() + if connErr := conn.CloseWrite(); connErr != nil { + logrus.Errorf("unable to close conn: %q", connErr) + } } stdinDone <- err }() diff --git a/libpod/oci_internal_linux.go b/libpod/oci_internal_linux.go index 1d8654eca..0bcd021db 100644 --- a/libpod/oci_internal_linux.go +++ b/libpod/oci_internal_linux.go @@ -19,6 +19,7 @@ import ( "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/cgroups" + "github.com/containers/libpod/pkg/errorhandling" "github.com/containers/libpod/pkg/lookup" "github.com/containers/libpod/pkg/util" "github.com/containers/libpod/utils" @@ -44,14 +45,14 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, restoreOptions *Containe if err != nil { return errors.Wrapf(err, "error creating socket pair") } - defer parentSyncPipe.Close() + defer errorhandling.CloseQuiet(parentSyncPipe) childStartPipe, parentStartPipe, err := newPipe() if err != nil { return errors.Wrapf(err, "error creating socket pair for start pipe") } - defer parentStartPipe.Close() + defer errorhandling.CloseQuiet(parentStartPipe) var ociLog string if logrus.GetLevel() != logrus.DebugLevel && r.supportsJSON { @@ -273,7 +274,7 @@ func (r *OCIRuntime) sharedConmonArgs(ctr *Container, cuuid, bundlePath, pidPath logDriver = JournaldLogging case JSONLogging: fallthrough - default: + default: //nolint-stylecheck // No case here should happen except JSONLogging, but keep this here in case the options are extended logrus.Errorf("%s logging specified but not supported. Choosing k8s-file logging instead", ctr.LogDriver()) fallthrough @@ -336,7 +337,9 @@ func startCommandGivenSelinux(cmd *exec.Cmd) error { err = cmd.Start() // Ignore error returned from SetProcessLabel("") call, // can't recover. - label.SetProcessLabel("") + if labelErr := label.SetProcessLabel(""); labelErr != nil { + logrus.Errorf("unable to set process label: %q", err) + } runtime.UnlockOSThread() return err } diff --git a/pkg/adapter/terminal_linux.go b/pkg/adapter/terminal_linux.go index 33ca0833b..de2600b75 100644 --- a/pkg/adapter/terminal_linux.go +++ b/pkg/adapter/terminal_linux.go @@ -27,7 +27,11 @@ func ExecAttachCtr(ctx context.Context, ctr *libpod.Container, tty, privileged b return -1, err } defer cancel() - defer restoreTerminal(oldTermState) + defer func() { + if err := restoreTerminal(oldTermState); err != nil { + logrus.Errorf("unable to restore terminal: %q", err) + } + }() } return ctr.Exec(tty, privileged, env, cmd, user, workDir, streams, preserveFDs, resize, detachKeys) } @@ -121,7 +125,7 @@ func handleTerminalAttach(ctx context.Context, resize chan remotecommand.Termina logrus.SetFormatter(&RawTtyFormatter{}) if _, err := term.SetRawTerminal(os.Stdin.Fd()); err != nil { - return nil, nil, err + return cancel, nil, err } return cancel, oldTermState, nil |