diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-20 12:16:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-20 12:16:29 -0700 |
| commit | afc461c9bdbce5930f5aaa62bb3d196a2b44bcad (patch) | |
| tree | 2b66c508e7b4a702833bba8e8ef9b01d7606bd82 /pkg/rootless | |
| parent | 1fad6b74f2a6360b26afbeea1a1705cfd42b6ca7 (diff) | |
| parent | 6e318a01a0a73d4c3c749ea03353bfc1be935d01 (diff) | |
| download | podman-afc461c9bdbce5930f5aaa62bb3d196a2b44bcad.tar.gz podman-afc461c9bdbce5930f5aaa62bb3d196a2b44bcad.tar.bz2 podman-afc461c9bdbce5930f5aaa62bb3d196a2b44bcad.zip | |
Merge pull request #3382 from openSUSE/execlp-fix
Fix execvp uage in rootless_linux.c
Diffstat (limited to 'pkg/rootless')
| -rw-r--r-- | pkg/rootless/rootless_linux.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index eb62d55e9..7be786ded 100644 --- a/pkg/rootless/rootless_linux.c +++ b/pkg/rootless/rootless_linux.c @@ -471,7 +471,7 @@ create_pause_process (const char *pause_pid_file_path, char **argv) close (fd); setenv ("_PODMAN_PAUSE", "1", 1); - execlp (argv[0], NULL); + execlp (argv[0], argv[0], NULL); /* If the execve fails, then do the pause here. */ do_pause (); @@ -693,7 +693,6 @@ reexec_in_user_namespace (int ready, char *pause_pid_file_path, char *file_to_re pid = syscall_clone (CLONE_NEWUSER|CLONE_NEWNS|SIGCHLD, NULL); if (pid < 0) { - FILE *fp; fprintf (stderr, "cannot clone: %s\n", strerror (errno)); check_proc_sys_userns_file (_max_user_namespaces); check_proc_sys_userns_file (_unprivileged_user_namespaces); |