From cb2631bf3ae1380a00818781f2f8ebab2e19c3bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Sj=C3=B6lund?= Date: Sat, 15 Oct 2022 09:34:48 +0200 Subject: [PATCH] rootless: fix return value handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [NO NEW TESTS NEEDED] Fixes: https://github.com/containers/podman/issues/15927 Signed-off-by: Erik Sjölund --- pkg/rootless/rootless_linux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index fb22ed2211..b47f3d2b9e 100644 --- a/pkg/rootless/rootless_linux.c +++ b/pkg/rootless/rootless_linux.c @@ -506,15 +506,15 @@ create_pause_process (const char *pause_pid_file_path, char **argv) if (pid) { char b; - int r; + int r, r2; close (p[1]); /* Block until we write the pid file. */ r = TEMP_FAILURE_RETRY (read (p[0], &b, 1)); close (p[0]); - r = reexec_in_user_namespace_wait (pid, 0); - if (r != 0) + r2 = reexec_in_user_namespace_wait (pid, 0); + if (r2 != 0) return -1; return r == 1 && b == '0' ? 0 : -1;