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

Merge pull request #3382 from openSUSE/execlp-fix

Browse Source 
Fix execvp uage in rootless_linux.c
This commit is contained in:
OpenShift Merge Robot
2019-06-20 12:16:29 -07:00
committed by GitHub
parent 1fad6b74f2 6e318a01a0
commit afc461c9bd
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/rootless/rootless_linux.c
View File

@ -471,7 +471,7 @@ create_pause_process (const char *pause_pid_file_path, char **argv)
close (fd); close (fd);
setenv ("_PODMAN_PAUSE", "1", 1); setenv ("_PODMAN_PAUSE", "1", 1);
execlp (argv[0], NULL); execlp (argv[0], argv[0], NULL);
/* If the execve fails, then do the pause here. */ /* If the execve fails, then do the pause here. */
do_pause (); 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); pid = syscall_clone (CLONE_NEWUSER|CLONE_NEWNS|SIGCHLD, NULL);
if (pid < 0) if (pid < 0)
{ {
FILE *fp;
fprintf (stderr, "cannot clone: %s\n", strerror (errno)); fprintf (stderr, "cannot clone: %s\n", strerror (errno));
check_proc_sys_userns_file (_max_user_namespaces); check_proc_sys_userns_file (_max_user_namespaces);
check_proc_sys_userns_file (_unprivileged_user_namespaces); check_proc_sys_userns_file (_unprivileged_user_namespaces);