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

rootless: force same cwd when re-execing

Browse Source 
when joining an existing namespace, we were not maintaining the
current working directory, causing commands like export -o to fail
when they weren't referring to absolute paths.

Closes: https://github.com/containers/libpod/issues/2381

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2019-02-21 11:13:12 +01:00
committed by Giuseppe Scrivano
parent c00bf28f24
commit 8984ba7461
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/rootless/rootless_linux.c
View File

@ -109,6 +109,13 @@ reexec_userns_join (int userns, int mountns)
char uid[16]; char uid[16];
char **argv; char **argv;
int pid; int pid;
char *cwd = getcwd (NULL, 0);
if (cwd == NULL)
{
fprintf (stderr, "error getting current working directory: %s\n", strerror (errno));
_exit (EXIT_FAILURE);
}
sprintf (uid, "%d", geteuid ()); sprintf (uid, "%d", geteuid ());
@ -154,6 +161,13 @@ reexec_userns_join (int userns, int mountns)
_exit (EXIT_FAILURE); _exit (EXIT_FAILURE);
} }
if (chdir (cwd) < 0)
{
fprintf (stderr, "cannot chdir: %s\n", strerror (errno));
_exit (EXIT_FAILURE);
}
free (cwd);
execvp (argv[0], argv); execvp (argv[0], argv);
_exit (EXIT_FAILURE); _exit (EXIT_FAILURE);
@ -190,6 +204,13 @@ reexec_in_user_namespace (int ready)
char *listen_fds = NULL; char *listen_fds = NULL;
char *listen_pid = NULL; char *listen_pid = NULL;
bool do_socket_activation = false; bool do_socket_activation = false;
char *cwd = getcwd (NULL, 0);
if (cwd == NULL)
{
fprintf (stderr, "error getting current working directory: %s\n", strerror (errno));
_exit (EXIT_FAILURE);
}
listen_pid = getenv("LISTEN_PID"); listen_pid = getenv("LISTEN_PID");
listen_fds = getenv("LISTEN_FDS"); listen_fds = getenv("LISTEN_FDS");
@ -265,6 +286,13 @@ reexec_in_user_namespace (int ready)
_exit (EXIT_FAILURE); _exit (EXIT_FAILURE);
} }
if (chdir (cwd) < 0)
{
fprintf (stderr, "cannot chdir: %s\n", strerror (errno));
_exit (EXIT_FAILURE);
}
free (cwd);
execvp (argv[0], argv); execvp (argv[0], argv);
_exit (EXIT_FAILURE); _exit (EXIT_FAILURE);