Merge pull request containers#16188 from eriksjolund/fix_issue_15927

rootless: fix return value handling
flouthoc · Oct 17, 2022 · 29d0cbe · 29d0cbe
2 parents 45fea91 + cb2631b
commit 29d0cbe
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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;