diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-09 15:37:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-09 15:37:16 -0400 |
| commit | 536951c1d23cd792e5e4ca8616f219d1cc08d39b (patch) | |
| tree | 6f82662c4043f6b9690c97fa4ef8a1db48eb1cc5 /libpod/oci_conmon_linux.go | |
| parent | 784e1ae137587ba7130eff315ebd6965e444da03 (diff) | |
| parent | 7cf22279d9499bfb7b2688cd2a6cb71617feba6e (diff) | |
| download | podman-536951c1d23cd792e5e4ca8616f219d1cc08d39b.tar.gz podman-536951c1d23cd792e5e4ca8616f219d1cc08d39b.tar.bz2 podman-536951c1d23cd792e5e4ca8616f219d1cc08d39b.zip | |
Merge pull request #11503 from Luap99/remote-attach
Fix conmon attach socket buffer size
Diffstat (limited to 'libpod/oci_conmon_linux.go')
| -rw-r--r-- | libpod/oci_conmon_linux.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 353e6af71..c00d83f95 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -46,7 +46,9 @@ import ( const ( // This is Conmon's STDIO_BUF_SIZE. I don't believe we have access to it // directly from the Go code, so const it here - bufferSize = conmonConfig.BufSize + // Important: The conmon attach socket uses an extra byte at the beginning of each + // message to specify the STREAM so we have to increase the buffer size by one + bufferSize = conmonConfig.BufSize + 1 ) // ConmonOCIRuntime is an OCI runtime managed by Conmon. |