diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-31 06:16:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 06:16:14 -0400 |
| commit | e911875b6af6efac4bfa2d0daa5ebc2fb9b8092b (patch) | |
| tree | 828d6f89a47db461de0432776bcb7900821468a1 /pkg/rootless/rootless_linux.c | |
| parent | 0e009d5f80a8aa3192035a8704b3fc3edcb729c6 (diff) | |
| parent | d188b2fe2272212f835f5b1ccb68278535b59803 (diff) | |
| download | podman-e911875b6af6efac4bfa2d0daa5ebc2fb9b8092b.tar.gz podman-e911875b6af6efac4bfa2d0daa5ebc2fb9b8092b.tar.bz2 podman-e911875b6af6efac4bfa2d0daa5ebc2fb9b8092b.zip | |
Merge pull request #7162 from giuseppe/add-rootless-checks
rootless: do not ignore errors if mappings are specified
Diffstat (limited to 'pkg/rootless/rootless_linux.c')
| -rw-r--r-- | pkg/rootless/rootless_linux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index d3e43e44d..eaf2d4551 100644 --- a/pkg/rootless/rootless_linux.c +++ b/pkg/rootless/rootless_linux.c @@ -860,7 +860,7 @@ reexec_in_user_namespace (int ready, char *pause_pid_file_path, char *file_to_re fprintf (stderr, "cannot read from sync pipe: %s\n", strerror (errno)); _exit (EXIT_FAILURE); } - if (b != '0') + if (ret != 1 || b != '0') _exit (EXIT_FAILURE); if (syscall_setresgid (0, 0, 0) < 0) |