diff options
author | Paul Holzinger <pholzing@redhat.com> | 2021-10-05 11:13:49 +0200 |
---|---|---|
committer | Matthew Heon <matthew.heon@pm.me> | 2021-10-19 14:08:58 -0400 |
commit | 2cd206d0fce477d123ab8b7acf19fdf34ca0a7aa (patch) | |
tree | c4e853dafd956eb34c0264fa7de4d097cc2528bb /libpod/oci_conmon_exec_linux.go | |
parent | 37347c3216a1e613f470fbd933a4257f472b3d2f (diff) | |
download | podman-2cd206d0fce477d123ab8b7acf19fdf34ca0a7aa.tar.gz podman-2cd206d0fce477d123ab8b7acf19fdf34ca0a7aa.tar.bz2 podman-2cd206d0fce477d123ab8b7acf19fdf34ca0a7aa.zip |
libpod: fix race when closing STDIN
There is a race where `conn.Close()` was called before `conn.CloseWrite()`.
In this case `CloseWrite` will fail and an useless error is printed. To
fix this we move the the `CloseWrite()` call to the same goroutine to
remove the race. This ensures that `CloseWrite()` is called before
`Close()` and never afterwards.
Also fixed podman-remote run where the STDIN was never was closed.
This is causing flakes in CI testing.
[NO TESTS NEEDED]
Fixes #11856
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
<MH: Fixed cherry-pick conflicts>
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod/oci_conmon_exec_linux.go')
-rw-r--r-- | libpod/oci_conmon_exec_linux.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libpod/oci_conmon_exec_linux.go b/libpod/oci_conmon_exec_linux.go index 5a7677b04..553c91833 100644 --- a/libpod/oci_conmon_exec_linux.go +++ b/libpod/oci_conmon_exec_linux.go @@ -609,9 +609,6 @@ func attachExecHTTP(c *Container, sessionID string, r *http.Request, w http.Resp _, err := utils.CopyDetachable(conn, httpBuf, detachKeys) logrus.Debugf("STDIN copy completed") stdinChan <- err - if connErr := conn.CloseWrite(); connErr != nil { - logrus.Errorf("Unable to close conn: %v", connErr) - } }() } @@ -654,6 +651,10 @@ func attachExecHTTP(c *Container, sessionID string, r *http.Request, w http.Resp 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 } |