opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-29 23:22:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16188 from eriksjolund/fix_issue_15927

Browse Source 
rootless: fix return value handling
This commit is contained in:
OpenShift Merge Robot
2022-10-17 04:07:33 -04:00
committed by GitHub
parent 45fea91a61 cb2631bf3a
commit 29d0cbe08f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/rootless/rootless_linux.c
View File

@ -506,15 +506,15 @@ create_pause_process (const char *pause_pid_file_path, char **argv)
if (pid) if (pid)
{ {
char b; char b;
int r; int r, r2;
close (p[1]); close (p[1]);
/* Block until we write the pid file. */ /* Block until we write the pid file. */
r = TEMP_FAILURE_RETRY (read (p[0], &b, 1)); r = TEMP_FAILURE_RETRY (read (p[0], &b, 1));
close (p[0]); close (p[0]);
r = reexec_in_user_namespace_wait (pid, 0); r2 = reexec_in_user_namespace_wait (pid, 0);
if (r != 0) if (r2 != 0)
return -1; return -1;
return r == 1 && b == '0' ? 0 : -1; return r == 1 && b == '0' ? 0 : -1;