diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-06 20:08:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-06 20:08:02 +0200 |
| commit | 03c17e94078236531b02ab437721853a09df119f (patch) | |
| tree | 27cd9b717db7c10b72da3b7bd4bd83272f3a8cb0 /libpod/oci_conmon_linux.go | |
| parent | 36504be96705423349ad437efab0cfc745085881 (diff) | |
| parent | fbce7584d786ed99354a4b33a9c127abd673c3bb (diff) | |
| download | podman-03c17e94078236531b02ab437721853a09df119f.tar.gz podman-03c17e94078236531b02ab437721853a09df119f.tar.bz2 podman-03c17e94078236531b02ab437721853a09df119f.zip | |
Merge pull request #11864 from Luap99/close
libpod: fix race when closing STDIN
Diffstat (limited to 'libpod/oci_conmon_linux.go')
| -rw-r--r-- | libpod/oci_conmon_linux.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 71a7b29fa..29ec4a92a 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -701,6 +701,10 @@ func (r *ConmonOCIRuntime) HTTPAttach(ctr *Container, req *http.Request, w http. if err != nil { return err } + // copy stdin is done, close it + if connErr := conn.CloseWrite(); connErr != nil { + logrus.Errorf("Unable to close conn: %v", connErr) + } case <-cancel: return nil } |