start: don't call lxc_map_ids() without id map

So far, we somehow always called lxc_map_ids(), even when no id map was configured. Let's not do this. Closes #1555. Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent bd3dfa33
......@@ -1086,8 +1086,12 @@ static int lxc_spawn(struct lxc_handler *handler)
int saved_ns_fd[LXC_NS_MAX];
int preserve_mask = 0, i, flags;
int netpipepair[2], nveths;
bool wants_to_map_ids;
struct lxc_list *id_map;
netpipe = -1;
id_map = &handler->conf->id_map;
wants_to_map_ids = !lxc_list_empty(id_map);
for (i = 0; i < LXC_NS_MAX; i++)
if (handler->conf->inherit_ns_fd[i] != -1)
......@@ -1149,7 +1153,7 @@ static int lxc_spawn(struct lxc_handler *handler)
* it readonly.
* If the container is unprivileged then skip rootfs pinning.
*/
if (lxc_list_empty(&handler->conf->id_map)) {
if (wants_to_map_ids) {
handler->pinfd = pin_rootfs(handler->conf->rootfs.path);
if (handler->pinfd == -1)
INFO("Failed to pin the rootfs for container \"%s\".", handler->name);
......@@ -1203,7 +1207,7 @@ static int lxc_spawn(struct lxc_handler *handler)
* mapped to something else on the host.) later to become a valid uid
* again.
*/
if (lxc_map_ids(&handler->conf->id_map, handler->pid)) {
if (wants_to_map_ids && lxc_map_ids(id_map, handler->pid)) {
ERROR("Failed to set up id mapping.");
goto out_delete_net;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment