Skip to content

Commit

Permalink
attach: move getcwd() into tighter scope
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
  • Loading branch information
Christian Brauner committed Feb 26, 2021
1 parent c4f23ca commit c86ef3c
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/lxc/attach.c
Expand Up @@ -1030,7 +1030,6 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
void *exec_payload, lxc_attach_options_t *options,
pid_t *attached_process)
{
__do_free char *cwd = NULL;
int ret_parent = -1;
struct attach_clone_payload payload = {};
struct lxc_epoll_descr descr = {};
Expand Down Expand Up @@ -1075,8 +1074,6 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
if (!no_new_privs(ctx->container, options))
WARN("Could not determine whether PR_SET_NO_NEW_PRIVS is set");

cwd = getcwd(NULL, 0);

/* Determine which namespaces the container was created with
* by asking lxc-start, if necessary.
*/
Expand Down Expand Up @@ -1178,6 +1175,8 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
}

if (pid == 0) {
char *cwd;

/* close unneeded file descriptors */
close_prot_errno_disarm(ipc_sockets[0]);

Expand All @@ -1197,6 +1196,8 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,

TRACE("Intermediate process starting to initialize");

cwd = getcwd(NULL, 0);

/* Attach now, create another subprocess later, since pid namespaces
* only really affect the children of the current process.
*/
Expand All @@ -1221,6 +1222,7 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
if (ret < 0)
WARN("Could not change directory to \"%s\"", new_cwd);
}
free_disarm(cwd);

/* Create attached process. */
payload.ipc_socket = ipc_sockets[1];
Expand Down Expand Up @@ -1278,7 +1280,6 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,

/* close unneeded file descriptors */
close(ipc_sockets[1]);
free_disarm(cwd);
close_nsfds(ctx);
if (options->attach_flags & LXC_ATTACH_TERMINAL)
lxc_attach_terminal_close_pts(&terminal);
Expand Down

0 comments on commit c86ef3c

Please sign in to comment.