Skip to content

L
lxc
Unverified Commit 4d1683e0 by Christian Brauner
Options

confile: cleanup set_config_mount_auto()

Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent af7064a7
Showing with 54 additions and 63 deletions
src/lxc/confile.c
...@@ -1978,43 +1978,44 @@ static int set_config_mount_fstab(const char *key, const char *value, ...@@ -1978,43 +1978,44 @@ static int set_config_mount_fstab(const char *key, const char *value,
static int set_config_mount_auto(const char *key, const char *value, static int set_config_mount_auto(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
char *autos, *token; __do_free char *autos = NULL;
char *token;
int i; int i;
int ret = -1;
static struct { static struct {
const char *token; const char *token;
int mask; int mask;
int flag; int flag;
} allowed_auto_mounts[] = { } allowed_auto_mounts[] = {
{ "proc", LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED }, { "proc", LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED },
{ "proc:mixed", LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED }, { "proc:mixed", LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_MIXED },
{ "proc:rw", LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_RW }, { "proc:rw", LXC_AUTO_PROC_MASK, LXC_AUTO_PROC_RW },
{ "sys", LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_MIXED }, { "sys", LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_MIXED },
{ "sys:ro", LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_RO }, { "sys:ro", LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_RO },
{ "sys:mixed", LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_MIXED }, { "sys:mixed", LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_MIXED },
{ "sys:rw", LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_RW }, { "sys:rw", LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_RW },
{ "cgroup", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_NOSPEC }, { "cgroup", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_NOSPEC },
{ "cgroup:mixed", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_MIXED }, { "cgroup:mixed", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_MIXED },
{ "cgroup:ro", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_RO }, { "cgroup:ro", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_RO },
{ "cgroup:rw", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_RW }, { "cgroup:rw", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_RW },
{ "cgroup:force", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_NOSPEC | LXC_AUTO_CGROUP_FORCE }, { "cgroup:force", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_NOSPEC | LXC_AUTO_CGROUP_FORCE },
{ "cgroup:mixed:force", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_MIXED | LXC_AUTO_CGROUP_FORCE }, { "cgroup:mixed:force", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_MIXED | LXC_AUTO_CGROUP_FORCE },
{ "cgroup:ro:force", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_RO | LXC_AUTO_CGROUP_FORCE }, { "cgroup:ro:force", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_RO | LXC_AUTO_CGROUP_FORCE },
{ "cgroup:rw:force", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_RW | LXC_AUTO_CGROUP_FORCE }, { "cgroup:rw:force", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_RW | LXC_AUTO_CGROUP_FORCE },
{ "cgroup-full", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_NOSPEC }, { "cgroup-full", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_NOSPEC },
{ "cgroup-full:mixed", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_MIXED }, { "cgroup-full:mixed", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_MIXED },
{ "cgroup-full:ro", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_RO }, { "cgroup-full:ro", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_RO },
{ "cgroup-full:rw", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_RW }, { "cgroup-full:rw", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_RW },
{ "cgroup-full:force", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_NOSPEC | LXC_AUTO_CGROUP_FORCE }, { "cgroup-full:force", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_NOSPEC | LXC_AUTO_CGROUP_FORCE },
{ "cgroup-full:mixed:force", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_MIXED | LXC_AUTO_CGROUP_FORCE }, { "cgroup-full:mixed:force", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_MIXED | LXC_AUTO_CGROUP_FORCE },
{ "cgroup-full:ro:force", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_RO | LXC_AUTO_CGROUP_FORCE }, { "cgroup-full:ro:force", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_RO | LXC_AUTO_CGROUP_FORCE },
{ "cgroup-full:rw:force", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_RW | LXC_AUTO_CGROUP_FORCE }, { "cgroup-full:rw:force", LXC_AUTO_CGROUP_MASK, LXC_AUTO_CGROUP_FULL_RW | LXC_AUTO_CGROUP_FORCE },
{ "shmounts:", LXC_AUTO_SHMOUNTS_MASK, LXC_AUTO_SHMOUNTS }, { "shmounts:", LXC_AUTO_SHMOUNTS_MASK, LXC_AUTO_SHMOUNTS },
/* For adding anything that is just a single on/off, but has no /*
* options: keep mask and flag identical and just define the enum * For adding anything that is just a single on/off, but has no
* value as an unused bit so far * options: keep mask and flag identical and just define the
*/ * enum value as an unused bit so far
{ NULL, 0, 0 } */
{ NULL, 0, 0 }
}; };
if (lxc_config_value_empty(value)) { if (lxc_config_value_empty(value)) {
...@@ -2024,7 +2025,7 @@ static int set_config_mount_auto(const char *key, const char *value, ...@@ -2024,7 +2025,7 @@ static int set_config_mount_auto(const char *key, const char *value,
autos = strdup(value); autos = strdup(value);
if (!autos) if (!autos)
return -1; return ret_errno(ENOMEM);
lxc_iterate_parts(token, autos, " \t") { lxc_iterate_parts(token, autos, " \t") {
bool is_shmounts = false; bool is_shmounts = false;
...@@ -2040,50 +2041,40 @@ static int set_config_mount_auto(const char *key, const char *value, ...@@ -2040,50 +2041,40 @@ static int set_config_mount_auto(const char *key, const char *value,
} }
} }
if (!allowed_auto_mounts[i].token) { if (!allowed_auto_mounts[i].token)
ERROR("Invalid filesystem to automount \"%s\"", token); return log_error_errno(-EINVAL, EINVAL, "Invalid filesystem to automount \"%s\"", token);
goto on_error;
}
lxc_conf->auto_mounts &= ~allowed_auto_mounts[i].mask; lxc_conf->auto_mounts &= ~allowed_auto_mounts[i].mask;
lxc_conf->auto_mounts |= allowed_auto_mounts[i].flag; lxc_conf->auto_mounts |= allowed_auto_mounts[i].flag;
if (is_shmounts) { if (is_shmounts) {
char *container_path; __do_free char *container_path = NULL, *host_path = NULL;
char *host_path; char *val;
host_path = token + STRLITERALLEN("shmounts:"); val = token + STRLITERALLEN("shmounts:");
if (*host_path == '\0') { if (*val == '\0')
SYSERROR("Failed to copy shmounts host path"); return log_error_errno(-EINVAL, EINVAL, "Failed to copy shmounts host path");
goto on_error;
} host_path = strdup(val);
if (!host_path)
return log_error_errno(-EINVAL, EINVAL, "Failed to copy shmounts host path");
container_path = strchr(host_path, ':'); val = strchr(host_path, ':');
if (!container_path || *(container_path + 1) == '\0') if (!val || *(val + 1) == '\0')
container_path = "/dev/.lxc-mounts"; val = "/dev/.lxc-mounts";
else else
*container_path++ = '\0'; *val++ = '\0';
lxc_conf->shmount.path_host = strdup(host_path); container_path = strdup(val);
if (!lxc_conf->shmount.path_host) { if(!container_path)
SYSERROR("Failed to copy shmounts host path"); return log_error_errno(-EINVAL, EINVAL, "Failed to copy shmounts container path");
goto on_error;
}
lxc_conf->shmount.path_cont = strdup(container_path); lxc_conf->shmount.path_host = move_ptr(host_path);
if(!lxc_conf->shmount.path_cont) { lxc_conf->shmount.path_cont = move_ptr(container_path);
SYSERROR("Failed to copy shmounts container path");
goto on_error;
}
} }
} }
ret = 0; return 0;
on_error:
free(autos);
return ret;
} }
static int set_config_mount(const char *key, const char *value, static int set_config_mount(const char *key, const char *value,
......
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