Skip to content

Commit

Permalink
conf: start stashing dfd to host's / during container setup
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 f4c4328 commit d6c618a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/lxc/conf.c
Expand Up @@ -2612,6 +2612,7 @@ struct lxc_conf *lxc_conf_init(void)
new->rootfs.managed = true;
new->rootfs.mntpt_fd = -EBADF;
new->rootfs.dev_mntpt_fd = -EBADF;
new->rootfs.dfd_root_host = -EBADF;
new->logfd = -1;
lxc_list_init(&new->cgroup);
lxc_list_init(&new->cgroup2);
Expand Down Expand Up @@ -3183,6 +3184,10 @@ int lxc_setup_rootfs_prepare_root(struct lxc_conf *conf, const char *name,
{
int ret;

conf->rootfs.dfd_root_host = open_at(-EBADF, "/", PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_ABSOLUTE, 0);
if (conf->rootfs.dfd_root_host < 0)
return log_error_errno(-errno, errno, "Failed to open \"/\"");

if (conf->rootfs_setup) {
const char *path = conf->rootfs.mount;

Expand Down Expand Up @@ -3513,6 +3518,7 @@ int lxc_setup(struct lxc_handler *handler)

close_prot_errno_disarm(lxc_conf->rootfs.mntpt_fd)
close_prot_errno_disarm(lxc_conf->rootfs.dev_mntpt_fd)
close_prot_errno_disarm(lxc_conf->rootfs.dfd_root_host)
NOTICE("The container \"%s\" is set up", name);

return 0;
Expand Down Expand Up @@ -3878,6 +3884,7 @@ void lxc_conf_free(struct lxc_conf *conf)
free(conf->rootfs.data);
close_prot_errno_disarm(conf->rootfs.mntpt_fd);
close_prot_errno_disarm(conf->rootfs.dev_mntpt_fd);
close_prot_errno_disarm(conf->rootfs.dfd_root_host);
free(conf->logfile);
if (conf->logfd != -1)
close(conf->logfd);
Expand Down
1 change: 1 addition & 0 deletions src/lxc/conf.h
Expand Up @@ -193,6 +193,7 @@ struct lxc_tty_info {
* @dev_mntpt_fd : fd for /dev of the container
*/
struct lxc_rootfs {
int dfd_root_host;
int mntpt_fd;
int dev_mntpt_fd;
char *path;
Expand Down

0 comments on commit d6c618a

Please sign in to comment.