mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-03 22:29:30 +00:00
Code Issues Releases Wiki Activity

conf: use mount_fd() in lxc_setup_dev_console()

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner
2021-07-30 09:27:54 +02:00
parent 84f8f9e470
commit af0cf9b759
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/lxc/conf.c
View File

@@ -1876,14 +1876,16 @@ static int lxc_bind_mount_console(const struct lxc_terminal *console,
static int lxc_setup_dev_console(struct lxc_rootfs *rootfs, static int lxc_setup_dev_console(struct lxc_rootfs *rootfs,
const struct lxc_terminal *console) const struct lxc_terminal *console)
{ {
__do_close int fd_console = -EBADF;
int ret; int ret;
char *rootfs_path = rootfs->path ? rootfs->mount : "";
/* /*
* When we are asked to setup a console we remove any previous * When we are asked to setup a console we remove any previous
* /dev/console bind-mounts. * /dev/console bind-mounts.
*/ */
if (exists_file_at(rootfs->dfd_dev, "console")) { if (exists_file_at(rootfs->dfd_dev, "console")) {
char *rootfs_path = rootfs->path ? rootfs->mount : "";
ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "%s/dev/console", rootfs_path); ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "%s/dev/console", rootfs_path);
if (ret < 0) if (ret < 0)
return -1; return -1;
@@ -1899,23 +1901,19 @@ static int lxc_setup_dev_console(struct lxc_rootfs *rootfs,
* For unprivileged containers autodev or automounts will already have * For unprivileged containers autodev or automounts will already have
* taken care of creating /dev/console. * taken care of creating /dev/console.
*/ */
ret = mknodat(rootfs->dfd_dev, "console", S_IFREG | 0000, 0); fd_console = open_at(rootfs->dfd_dev, "console", PROTECT_OPEN | O_CREAT,
if (ret < 0 && errno != EEXIST) PROTECT_LOOKUP_BENEATH, 0000);
return log_error_errno(-errno, errno, "Failed to create console"); if (fd_console < 0)
return syserror("Failed to create console");
ret = fchmod(console->pty, 0620); ret = fchmod(console->pty, 0620);
if (ret < 0) if (ret < 0)
return log_error_errno(-errno, errno, "Failed to set mode \"0%o\" to \"%s\"", 0620, console->name); return log_error_errno(-errno, errno, "Failed to set mode \"0%o\" to \"%s\"", 0620, console->name);
if (can_use_mount_api()) { if (can_use_mount_api())
ret = lxc_bind_mount_console(console, rootfs->dfd_dev, "console"); ret = lxc_bind_mount_console(console, rootfs->dfd_dev, "console");
} else { else
ret = strnprintf(rootfs->buf, sizeof(rootfs->buf), "%s/dev/console", rootfs_path); ret = mount_fd(console->pty, fd_console, "none", MS_BIND, NULL);
if (ret < 0)
return ret;
ret = safe_mount(console->name, rootfs->buf, "none", MS_BIND, NULL, rootfs_path);
}
if (ret < 0) if (ret < 0)
return log_error_errno(ret, errno, "Failed to mount %d(%s) on \"%s\"", console->pty, console->name, rootfs->buf); return log_error_errno(ret, errno, "Failed to mount %d(%s) on \"%s\"", console->pty, console->name, rootfs->buf);