From 4e5a9657cafad69d8447a385abb1a384423b54f8 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Mon, 17 Dec 2018 11:45:58 +0100 Subject: [PATCH] lxccontainer: fix mount api (mount_injection_file) Signed-off-by: Christian Brauner --- src/lxc/api_extensions.h | 1 + src/lxc/lxccontainer.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lxc/api_extensions.h b/src/lxc/api_extensions.h index 226567f66..810d39828 100644 --- a/src/lxc/api_extensions.h +++ b/src/lxc/api_extensions.h @@ -40,6 +40,7 @@ static char *api_extensions[] = { "reboot2", "mount_injection", "cgroup_relative", + "mount_injection_file", }; static size_t nr_api_extensions = sizeof(api_extensions) / sizeof(*api_extensions); diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c index a7f29838a..1e5e6ad05 100644 --- a/src/lxc/lxccontainer.c +++ b/src/lxc/lxccontainer.c @@ -5045,10 +5045,13 @@ static int do_lxcapi_mount(struct lxc_container *c, const char *source, /* Enter the container namespaces */ if (!lxc_list_empty(&c->lxc_conf->id_map)) { - if (!switch_to_ns(init_pid, "user")){ + if (!switch_to_ns(init_pid, "user")) { ERROR("Failed to enter user namespace"); _exit(EXIT_FAILURE); } + + if (!lxc_switch_uid_gid(0, 0)) + _exit(EXIT_FAILURE); } if (!switch_to_ns(init_pid, "mnt")) { -- 2.39.2