Merge pull request #5396 from haircommander/fix_exec_error

exec: fix error code when conmon fails

1 files changed, 6 insertions, 0 deletions

diff --git a/libpod/container_api.go b/libpod/container_api.go
index 356da12d0..dc7470f1a 100644
--- a/libpod/container_api.go
+++ b/libpod/container_api.go
@@ -340,6 +340,12 @@ func (c *Container) Exec(tty, privileged bool, env map[string]string, cmd []stri
 		if lastErr != nil {
 			logrus.Errorf(lastErr.Error())
 		}
+		// ErrorConmonRead is a bogus value set by podman to indicate reading a value from
+		// conmon failed. Since it is specifically not a valid exit code, we should set
+		// a generic error here
+		if exitCodeData.data == define.ErrorConmonRead {
+			exitCodeData.data = define.ExecErrorCodeGeneric
+		}
 		lastErr = errors.Wrapf(define.ErrOCIRuntime, "non zero exit code: %d", exitCodeData.data)
 	}