#define _GNU_SOURCE
#include <errno.h>
#include <fcntl.h>
+#include <termios.h>
#include <grp.h>
#include <pwd.h>
#include <signal.h>
#include "conf.h"
#include "config.h"
#include "confile.h"
-#include "console.h"
#include "log.h"
#include "lsm/lsm.h"
#include "lxclock.h"
#include "lxcseccomp.h"
#include "mainloop.h"
#include "namespace.h"
+#include "terminal.h"
#include "utils.h"
#if HAVE_SYS_PERSONALITY_H
#define MS_SLAVE (1 << 19)
#endif
-lxc_log_define(lxc_attach, lxc);
+lxc_log_define(attach, lxc);
/* /proc/pid-to-str/status\0 = (5 + 21 + 7 + 1) */
#define __PROC_STATUS_LEN (5 + (LXC_NUMSTRLEN64) + 7 + 1)
lxc_proc_close_ns_fd(ctx);
free(ctx);
- ctx = NULL;
}
/**
if (extra_keep_store[i]) {
ret = setenv(extra_keep[i], extra_keep_store[i], 1);
if (ret < 0)
- WARN("%s - Failed to set environment variable", strerror(errno));
+ SYSWARN("Failed to set environment variable");
}
free(extra_keep_store[i]);
}
if (!path_kept) {
ret = setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", 1);
if (ret < 0)
- WARN("%s - Failed to set environment variable", strerror(errno));
+ SYSWARN("Failed to set environment variable");
}
}
ret = putenv("container=lxc");
if (ret < 0) {
- WARN("%s - Failed to set environment variable", strerror(errno));
+ SYSWARN("Failed to set environment variable");
return -1;
}
ret = putenv(p);
if (ret < 0)
- WARN("%s - Failed to set environment variable", strerror(errno));
+ SYSWARN("Failed to set environment variable");
}
}
int fd, ret;
pid_t pid;
int pipes[2];
- char *result = NULL;
+ FILE *pipe_f;
+ bool found = false;
+ size_t line_bufsz = 0;
+ char *line = NULL, *result = NULL;
/* We need to fork off a process that runs the getent program, and we
* need to capture its output, so we use a pipe for that purpose.
*/
- ret = pipe(pipes);
+ ret = pipe2(pipes, O_CLOEXEC);
if (ret < 0)
return NULL;
return NULL;
}
- if (pid) {
- int status;
- FILE *pipe_f;
- int found = 0;
- size_t line_bufsz = 0;
- char *line = NULL;
-
- close(pipes[1]);
-
- pipe_f = fdopen(pipes[0], "r");
- while (getline(&line, &line_bufsz, pipe_f) != -1) {
- int i;
- long value;
- char *token;
- char *endptr = NULL, *saveptr = NULL;
-
- /* If we already found something, just continue to read
- * until the pipe doesn't deliver any more data, but
- * don't modify the existing data structure.
- */
- if (found)
- continue;
-
- /* Trim line on the right hand side. */
- for (i = strlen(line); i > 0 && (line[i - 1] == '\n' || line[i - 1] == '\r'); --i)
- line[i - 1] = '\0';
-
- /* Split into tokens: first: user name. */
- token = strtok_r(line, ":", &saveptr);
- if (!token)
- continue;
- /* next: dummy password field */
- token = strtok_r(NULL, ":", &saveptr);
- if (!token)
- continue;
- /* next: user id */
- token = strtok_r(NULL, ":", &saveptr);
- value = token ? strtol(token, &endptr, 10) : 0;
- if (!token || !endptr || *endptr || value == LONG_MIN || value == LONG_MAX)
- continue;
- /* dummy sanity check: user id matches */
- if ((uid_t) value != uid)
- continue;
- /* skip fields: gid, gecos, dir, go to next field 'shell' */
- for (i = 0; i < 4; i++) {
- token = strtok_r(NULL, ":", &saveptr);
- if (!token)
- break;
- }
- if (!token)
- continue;
- free(result);
- result = strdup(token);
-
- /* Sanity check that there are no fields after that. */
- token = strtok_r(NULL, ":", &saveptr);
- if (token)
- continue;
-
- found = 1;
- }
-
- free(line);
- fclose(pipe_f);
- again:
- if (waitpid(pid, &status, 0) < 0) {
- if (errno == EINTR)
- goto again;
- free(result);
- return NULL;
- }
-
- /* Some sanity checks. If anything even hinted at going wrong,
- * we can't be sure we have a valid result, so we assume we
- * don't.
- */
-
- if (!WIFEXITED(status)) {
- free(result);
- return NULL;
- }
-
- if (WEXITSTATUS(status) != 0) {
- free(result);
- return NULL;
- }
-
- if (!found) {
- free(result);
- return NULL;
- }
-
- return result;
- } else {
+ if (!pid) {
char uid_buf[32];
char *arguments[] = {
"getent",
close(pipes[0]);
/* We want to capture stdout. */
- dup2(pipes[1], 1);
+ ret = dup2(pipes[1], STDOUT_FILENO);
close(pipes[1]);
+ if (ret < 0)
+ exit(EXIT_FAILURE);
/* Get rid of stdin/stderr, so we try to associate it with
* /dev/null.
*/
- fd = open("/dev/null", O_RDWR);
+ fd = open_devnull();
if (fd < 0) {
- close(0);
- close(2);
+ close(STDIN_FILENO);
+ close(STDERR_FILENO);
} else {
- dup2(fd, 0);
- dup2(fd, 2);
+ (void)dup3(fd, STDIN_FILENO, O_CLOEXEC);
+ (void)dup3(fd, STDOUT_FILENO, O_CLOEXEC);
close(fd);
}
/* Finish argument list. */
- ret = snprintf(uid_buf, sizeof(uid_buf), "%ld", (long) uid);
- if (ret <= 0)
- exit(-1);
+ ret = snprintf(uid_buf, sizeof(uid_buf), "%ld", (long)uid);
+ if (ret <= 0 || ret >= sizeof(uid_buf))
+ exit(EXIT_FAILURE);
/* Try to run getent program. */
- (void) execvp("getent", arguments);
- exit(-1);
+ (void)execvp("getent", arguments);
+ exit(EXIT_FAILURE);
+ }
+
+ close(pipes[1]);
+
+ pipe_f = fdopen(pipes[0], "r");
+ while (getline(&line, &line_bufsz, pipe_f) != -1) {
+ int i;
+ long value;
+ char *token;
+ char *endptr = NULL, *saveptr = NULL;
+
+ /* If we already found something, just continue to read
+ * until the pipe doesn't deliver any more data, but
+ * don't modify the existing data structure.
+ */
+ if (found)
+ continue;
+
+ /* Trim line on the right hand side. */
+ for (i = strlen(line); i > 0 && (line[i - 1] == '\n' || line[i - 1] == '\r'); --i)
+ line[i - 1] = '\0';
+
+ /* Split into tokens: first: user name. */
+ token = strtok_r(line, ":", &saveptr);
+ if (!token)
+ continue;
+
+ /* next: dummy password field */
+ token = strtok_r(NULL, ":", &saveptr);
+ if (!token)
+ continue;
+
+ /* next: user id */
+ token = strtok_r(NULL, ":", &saveptr);
+ value = token ? strtol(token, &endptr, 10) : 0;
+ if (!token || !endptr || *endptr || value == LONG_MIN ||
+ value == LONG_MAX)
+ continue;
+
+ /* dummy sanity check: user id matches */
+ if ((uid_t)value != uid)
+ continue;
+
+ /* skip fields: gid, gecos, dir, go to next field 'shell' */
+ for (i = 0; i < 4; i++) {
+ token = strtok_r(NULL, ":", &saveptr);
+ if (!token)
+ continue;
+ }
+ if (!token)
+ continue;
+ free(result);
+ result = strdup(token);
+
+ /* Sanity check that there are no fields after that. */
+ token = strtok_r(NULL, ":", &saveptr);
+ if (token)
+ continue;
+
+ found = true;
}
+ free(line);
+ fclose(pipe_f);
+
+ ret = wait_for_pid(pid);
+ if (ret < 0) {
+ free(result);
+ return NULL;
+ }
+
+ if (!found) {
+ free(result);
+ return NULL;
+ }
+
+ return result;
}
static void lxc_attach_get_init_uidgid(uid_t *init_uid, gid_t *init_gid)
uid_t uid = (uid_t)-1;
gid_t gid = (gid_t)-1;
- /* Read capabilities. */
- snprintf(proc_fn, __PROC_STATUS_LEN, "/proc/%d/status", 1);
+ ret = snprintf(proc_fn, __PROC_STATUS_LEN, "/proc/%d/status", 1);
+ if (ret < 0 || ret >= __PROC_STATUS_LEN)
+ return;
proc_file = fopen(proc_fn, "r");
if (!proc_file)
/* Define default options if no options are supplied by the user. */
static lxc_attach_options_t attach_static_default_options = LXC_ATTACH_OPTIONS_DEFAULT;
-static bool fetch_seccomp(struct lxc_container *c,
- lxc_attach_options_t *options)
+static bool fetch_seccomp(struct lxc_container *c, lxc_attach_options_t *options)
{
+ int ret;
+ bool bret;
char *path;
if (!(options->namespaces & CLONE_NEWNS) ||
}
/* Remove current setting. */
- if (!c->set_config_item(c, "lxc.seccomp", "") &&
- !c->set_config_item(c, "lxc.seccomp.profile", "")) {
+ if (!c->set_config_item(c, "lxc.seccomp.profile", "") &&
+ !c->set_config_item(c, "lxc.seccomp", "")) {
return false;
}
/* Fetch the current profile path over the cmd interface. */
path = c->get_running_config_item(c, "lxc.seccomp.profile");
if (!path) {
- INFO("Failed to get running config item for lxc.seccomp.profile");
+ INFO("Failed to retrieve lxc.seccomp.profile");
path = c->get_running_config_item(c, "lxc.seccomp");
- }
- if (!path) {
- INFO("Failed to get running config item for lxc.seccomp");
- return true;
+ if (!path) {
+ INFO("Failed to retrieve lxc.seccomp");
+ return true;
+ }
}
/* Copy the value into the new lxc_conf. */
- if (!c->set_config_item(c, "lxc.seccomp.profile", path)) {
- free(path);
- return false;
- }
+ bret = c->set_config_item(c, "lxc.seccomp.profile", path);
free(path);
+ if (!bret)
+ return false;
/* Attempt to parse the resulting config. */
- if (lxc_read_seccomp_config(c->lxc_conf) < 0) {
- ERROR("Error reading seccomp policy.");
+ ret = lxc_read_seccomp_config(c->lxc_conf);
+ if (ret < 0) {
+ ERROR("Failed to retrieve seccomp policy");
return false;
}
- INFO("Retrieved seccomp policy.");
+ INFO("Retrieved seccomp policy");
return true;
}
static bool no_new_privs(struct lxc_container *c, lxc_attach_options_t *options)
{
+ bool bret;
char *val;
/* Remove current setting. */
- if (!c->set_config_item(c, "lxc.no_new_privs", ""))
+ if (!c->set_config_item(c, "lxc.no_new_privs", "")) {
+ INFO("Failed to unset lxc.no_new_privs");
return false;
+ }
/* Retrieve currently active setting. */
val = c->get_running_config_item(c, "lxc.no_new_privs");
if (!val) {
- INFO("Failed to get running config item for lxc.no_new_privs.");
+ INFO("Failed to retrieve lxc.no_new_privs");
return false;
}
/* Set currently active setting. */
- if (!c->set_config_item(c, "lxc.no_new_privs", val)) {
- free(val);
- return false;
- }
+ bret = c->set_config_item(c, "lxc.no_new_privs", val);
free(val);
-
- return true;
+ return bret;
}
static signed long get_personality(const char *name, const char *lxcpath)
struct attach_clone_payload {
int ipc_socket;
- int pty_fd;
+ int terminal_slave_fd;
lxc_attach_options_t *options;
struct lxc_proc_context_info *init_ctx;
lxc_attach_exec_t exec_function;
p->ipc_socket = -EBADF;
}
- if (p->pty_fd >= 0) {
- close(p->pty_fd);
- p->pty_fd = -EBADF;
+ if (p->terminal_slave_fd >= 0) {
+ close(p->terminal_slave_fd);
+ p->terminal_slave_fd = -EBADF;
}
if (p->init_ctx) {
*/
if (needs_lsm) {
ret = lxc_abstract_unix_recv_fds(payload->ipc_socket, &lsm_fd, 1, NULL, 0);
- if (ret <= 0)
+ if (ret <= 0) {
+ if (ret < 0)
+ SYSERROR("Failed to receive lsm label fd");
+
goto on_error;
+ }
+
TRACE("Received LSM label file descriptor %d from parent", lsm_fd);
}
if (options->stdin_fd > 0 && isatty(options->stdin_fd)) {
- ret = lxc_make_controlling_pty(options->stdin_fd);
+ ret = lxc_make_controlling_terminal(options->stdin_fd);
if (ret < 0)
goto on_error;
}
ret = lxc_switch_uid_gid(new_uid, new_gid);
if (ret < 0)
goto on_error;
-
- ret = lxc_setgroups(0, NULL);
- if (ret < 0)
- goto on_error;
}
+ ret = lxc_setgroups(0, NULL);
+ if (ret < 0 && errno != EPERM)
+ goto on_error;
+
if ((init_ctx->container && init_ctx->container->lxc_conf &&
init_ctx->container->lxc_conf->no_new_privs) ||
(options->attach_flags & LXC_ATTACH_NO_NEW_PRIVS)) {
close(payload->ipc_socket);
payload->ipc_socket = -EBADF;
lxc_proc_put_context_info(init_ctx);
+ payload->init_ctx = NULL;
/* The following is done after the communication socket is shut down.
* That way, all errors that might (though unlikely) occur up until this
* may want to make sure the fds are closed, for example.
*/
if (options->stdin_fd >= 0 && options->stdin_fd != STDIN_FILENO)
- dup2(options->stdin_fd, STDIN_FILENO);
+ (void)dup2(options->stdin_fd, STDIN_FILENO);
if (options->stdout_fd >= 0 && options->stdout_fd != STDOUT_FILENO)
- dup2(options->stdout_fd, STDOUT_FILENO);
+ (void)dup2(options->stdout_fd, STDOUT_FILENO);
if (options->stderr_fd >= 0 && options->stderr_fd != STDERR_FILENO)
- dup2(options->stderr_fd, STDERR_FILENO);
+ (void)dup2(options->stderr_fd, STDERR_FILENO);
/* close the old fds */
if (options->stdin_fd > STDERR_FILENO)
* here, ignore errors.
*/
for (fd = STDIN_FILENO; fd <= STDERR_FILENO; fd++) {
- int flags;
-
- flags = fcntl(fd, F_GETFL);
- if (flags < 0)
- continue;
-
- if ((flags & FD_CLOEXEC) == 0)
- continue;
-
- ret = fcntl(fd, F_SETFL, flags & ~FD_CLOEXEC);
+ ret = fd_cloexec(fd, false);
if (ret < 0) {
SYSERROR("Failed to clear FD_CLOEXEC from file descriptor %d", fd);
goto on_error;
}
}
- if (options->attach_flags & LXC_ATTACH_ALLOCATE_PTY) {
- ret = lxc_login_pty(payload->pty_fd);
+ if (options->attach_flags & LXC_ATTACH_TERMINAL) {
+ ret = lxc_terminal_prepare_login(payload->terminal_slave_fd);
if (ret < 0) {
- SYSERROR("Failed to prepare pty file descriptor %d", payload->pty_fd);
+ SYSERROR("Failed to prepare terminal file descriptor %d", payload->terminal_slave_fd);
goto on_error;
}
- TRACE("Prepared pty file descriptor %d", payload->pty_fd);
+ TRACE("Prepared terminal file descriptor %d", payload->terminal_slave_fd);
}
/* We're done, so we can now do whatever the user intended us to do. */
rexit(EXIT_FAILURE);
}
-static int lxc_attach_pty(struct lxc_conf *conf, struct lxc_pty *pty)
+static int lxc_attach_terminal(struct lxc_conf *conf,
+ struct lxc_terminal *terminal)
{
int ret;
- lxc_pty_init(pty);
+ lxc_terminal_init(terminal);
- ret = lxc_pty_create(pty);
+ ret = lxc_terminal_create(terminal);
if (ret < 0) {
- SYSERROR("Failed to create pty");
+ SYSERROR("Failed to create terminal");
return -1;
}
/* Shift ttys to container. */
- ret = lxc_pty_map_ids(conf, pty);
+ ret = lxc_terminal_map_ids(conf, terminal);
if (ret < 0) {
- ERROR("Failed to shift pty");
+ ERROR("Failed to chown terminal");
goto on_error;
}
return 0;
on_error:
- lxc_console_delete(pty);
- lxc_pty_conf_free(pty);
+ lxc_terminal_delete(terminal);
+ lxc_terminal_conf_free(terminal);
return -1;
}
-static int lxc_attach_pty_mainloop_init(struct lxc_pty *pty,
- struct lxc_epoll_descr *descr)
+static int lxc_attach_terminal_mainloop_init(struct lxc_terminal *terminal,
+ struct lxc_epoll_descr *descr)
{
int ret;
return -1;
}
- ret = lxc_console_mainloop_add(descr, pty);
+ ret = lxc_terminal_mainloop_add(descr, terminal);
if (ret < 0) {
ERROR("Failed to add handlers to mainloop");
lxc_mainloop_close(descr);
return 0;
}
-static inline void lxc_attach_pty_close_master(struct lxc_pty *pty)
+static inline void lxc_attach_terminal_close_master(struct lxc_terminal *terminal)
{
- if (pty->master < 0)
+ if (terminal->master < 0)
return;
- close(pty->master);
- pty->master = -EBADF;
+ close(terminal->master);
+ terminal->master = -EBADF;
}
-static inline void lxc_attach_pty_close_slave(struct lxc_pty *pty)
+static inline void lxc_attach_terminal_close_slave(struct lxc_terminal *terminal)
{
- if (pty->slave < 0)
+ if (terminal->slave < 0)
return;
- close(pty->slave);
- pty->slave = -EBADF;
+ close(terminal->slave);
+ terminal->slave = -EBADF;
}
-static inline void lxc_attach_pty_close_peer(struct lxc_pty *pty)
+static inline void lxc_attach_terminal_close_peer(struct lxc_terminal *terminal)
{
- if (pty->peer < 0)
+ if (terminal->peer < 0)
return;
- close(pty->peer);
- pty->peer = -EBADF;
+ close(terminal->peer);
+ terminal->peer = -EBADF;
}
-static inline void lxc_attach_pty_close_log(struct lxc_pty *pty)
+static inline void lxc_attach_terminal_close_log(struct lxc_terminal *terminal)
{
- if (pty->log_fd < 0)
+ if (terminal->log_fd < 0)
return;
- close(pty->log_fd);
- pty->log_fd = -EBADF;
+ close(terminal->log_fd);
+ terminal->log_fd = -EBADF;
}
int lxc_attach(const char *name, const char *lxcpath,
signed long personality;
pid_t attached_pid, init_pid, pid;
struct lxc_proc_context_info *init_ctx;
- struct lxc_pty pty;
+ struct lxc_terminal terminal;
struct lxc_conf *conf;
struct attach_clone_payload payload = {0};
init_pid = lxc_cmd_get_init_pid(name, lxcpath);
if (init_pid < 0) {
- ERROR("Failed to get init pid.");
+ ERROR("Failed to get init pid");
return -1;
}
conf = init_ctx->container->lxc_conf;
if (!fetch_seccomp(init_ctx->container, options))
- WARN("Failed to get seccomp policy.");
+ WARN("Failed to get seccomp policy");
if (!no_new_privs(init_ctx->container, options))
- WARN("Could not determine whether PR_SET_NO_NEW_PRIVS is set.");
+ WARN("Could not determine whether PR_SET_NO_NEW_PRIVS is set");
cwd = getcwd(NULL, 0);
return -1;
}
- if (options->attach_flags & LXC_ATTACH_ALLOCATE_PTY) {
- ret = lxc_attach_pty(conf, &pty);
+ if (options->attach_flags & LXC_ATTACH_TERMINAL) {
+ ret = lxc_attach_terminal(conf, &terminal);
if (ret < 0) {
- ERROR("Failed to allocate pty");
+ ERROR("Failed to setup new terminal");
free(cwd);
lxc_proc_put_context_info(init_ctx);
return -1;
}
- pty.log_fd = options->log_fd;
+ terminal.log_fd = options->log_fd;
} else {
- lxc_pty_init(&pty);
+ lxc_terminal_init(&terminal);
}
/* Create a socket pair for IPC communication; set SOCK_CLOEXEC in order
*/
ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);
if (ret < 0) {
- SYSERROR("Could not set up required IPC mechanism for attaching.");
+ SYSERROR("Could not set up required IPC mechanism for attaching");
free(cwd);
lxc_proc_put_context_info(init_ctx);
return -1;
*/
pid = fork();
if (pid < 0) {
- SYSERROR("Failed to create first subprocess.");
+ SYSERROR("Failed to create first subprocess");
free(cwd);
lxc_proc_put_context_info(init_ctx);
return -1;
close(ipc_sockets[1]);
free(cwd);
lxc_proc_close_ns_fd(init_ctx);
- if (options->attach_flags & LXC_ATTACH_ALLOCATE_PTY)
- lxc_attach_pty_close_slave(&pty);
+ if (options->attach_flags & LXC_ATTACH_TERMINAL)
+ lxc_attach_terminal_close_slave(&terminal);
/* Attach to cgroup, if requested. */
if (options->attach_flags & LXC_ATTACH_MOVE_TO_CGROUP) {
- if (!cgroup_attach(name, lxcpath, pid))
+ struct cgroup_ops *cgroup_ops;
+
+ cgroup_ops = cgroup_init(NULL);
+ if (!cgroup_ops)
+ goto on_error;
+
+ if (!cgroup_ops->attach(cgroup_ops, name, lxcpath, pid))
goto on_error;
- TRACE("Moved intermediate process %d into container's "
- "cgroups", pid);
+
+ cgroup_exit(cgroup_ops);
+ TRACE("Moved intermediate process %d into container's cgroups", pid);
}
/* Setup /proc limits */
goto on_error;
}
- if (options->attach_flags & LXC_ATTACH_ALLOCATE_PTY) {
- ret = lxc_attach_pty_mainloop_init(&pty, &descr);
+ if (options->attach_flags & LXC_ATTACH_TERMINAL) {
+ ret = lxc_attach_terminal_mainloop_init(&terminal, &descr);
if (ret < 0)
goto on_error;
- TRACE("Initalized pty mainloop");
+ TRACE("Initialized terminal mainloop");
}
/* Let the child process know to go ahead. */
/* Send child fd of the LSM security module to write to. */
ret = lxc_abstract_unix_send_fds(ipc_sockets[0], &labelfd, 1, NULL, 0);
- close(labelfd);
if (ret <= 0) {
- SYSERROR("%d", (int)ret);
+ if (ret < 0)
+ SYSERROR("Failed to send lsm label fd");
+
+ close(labelfd);
goto close_mainloop;
}
+
+ close(labelfd);
TRACE("Sent LSM label file descriptor %d to child", labelfd);
}
ret_parent = 0;
to_cleanup_pid = -1;
- if (options->attach_flags & LXC_ATTACH_ALLOCATE_PTY) {
+ if (options->attach_flags & LXC_ATTACH_TERMINAL) {
ret = lxc_mainloop(&descr, -1);
if (ret < 0) {
ret_parent = -1;
}
close_mainloop:
- if (options->attach_flags & LXC_ATTACH_ALLOCATE_PTY)
+ if (options->attach_flags & LXC_ATTACH_TERMINAL)
lxc_mainloop_close(&descr);
on_error:
if (to_cleanup_pid > 0)
(void)wait_for_pid(to_cleanup_pid);
- if (options->attach_flags & LXC_ATTACH_ALLOCATE_PTY) {
- lxc_console_delete(&pty);
- lxc_pty_conf_free(&pty);
+ if (options->attach_flags & LXC_ATTACH_TERMINAL) {
+ lxc_terminal_delete(&terminal);
+ lxc_terminal_conf_free(&terminal);
}
lxc_proc_put_context_info(init_ctx);
return ret_parent;
/* close unneeded file descriptors */
close(ipc_sockets[0]);
ipc_sockets[0] = -EBADF;
- if (options->attach_flags & LXC_ATTACH_ALLOCATE_PTY) {
- lxc_attach_pty_close_master(&pty);
- lxc_attach_pty_close_peer(&pty);
- lxc_attach_pty_close_log(&pty);
+ if (options->attach_flags & LXC_ATTACH_TERMINAL) {
+ lxc_attach_terminal_close_master(&terminal);
+ lxc_attach_terminal_close_peer(&terminal);
+ lxc_attach_terminal_close_log(&terminal);
}
/* Wait for the parent to have setup cgroups. */
payload.ipc_socket = ipc_sockets[1];
payload.options = options;
payload.init_ctx = init_ctx;
- payload.pty_fd = pty.slave;
+ payload.terminal_slave_fd = terminal.slave;
payload.exec_function = exec_function;
payload.exec_payload = exec_payload;
ERROR("Failed to exec");
_exit(EXIT_FAILURE);
}
- if (options->attach_flags & LXC_ATTACH_ALLOCATE_PTY)
- lxc_attach_pty_close_slave(&pty);
+ if (options->attach_flags & LXC_ATTACH_TERMINAL)
+ lxc_attach_terminal_close_slave(&terminal);
/* Tell grandparent the pid of the pid of the newly created child. */
ret = lxc_write_nointr(ipc_sockets[1], &pid, sizeof(pid));
int lxc_attach_run_shell(void* payload)
{
uid_t uid;
- struct passwd *passwd;
+ struct passwd pwent;
+ struct passwd *pwentp = NULL;
char *user_shell;
+ char *buf;
+ size_t bufsize;
+ int ret;
/* Ignore payload parameter. */
(void)payload;
uid = getuid();
- passwd = getpwuid(uid);
+
+ bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
+ if (bufsize == -1)
+ bufsize = 1024;
+
+ buf = malloc(bufsize);
+ if (buf) {
+ ret = getpwuid_r(uid, &pwent, buf, bufsize, &pwentp);
+ if (!pwentp) {
+ if (ret == 0)
+ WARN("Could not find matched password record.");
+
+ WARN("Failed to get password record - %u", uid);
+ }
+ }
/* This probably happens because of incompatible nss implementations in
* host and container (remember, this code is still using the host's
* the information by spawning a [getent passwd uid] process and parsing
* the result.
*/
- if (!passwd)
+ if (!pwentp)
user_shell = lxc_attach_getpwshell(uid);
else
- user_shell = passwd->pw_shell;
+ user_shell = pwent.pw_shell;
if (user_shell)
execlp(user_shell, user_shell, (char *)NULL);
*/
execlp("/bin/sh", "/bin/sh", (char *)NULL);
SYSERROR("Failed to execute shell");
- if (!passwd)
+ if (!pwentp)
free(user_shell);
+ free(buf);
return -1;
}