Skip to content

L
lxc
Unverified Commit bf7e2093 by Stéphane Graber Committed by GitHub
Options

Merge pull request #3283 from brauner/2020-03-10/fixes

bugfixes
parents 44512eee 2580145f
Showing with 191 additions and 214 deletions
configure.ac
...@@ -701,6 +701,10 @@ AC_CHECK_FUNCS([strlcat], ...@@ -701,6 +701,10 @@ AC_CHECK_FUNCS([strlcat],
AM_CONDITIONAL(HAVE_STRLCAT, true) AM_CONDITIONAL(HAVE_STRLCAT, true)
AC_DEFINE(HAVE_STRLCAT,1,[Have strlcat]), AC_DEFINE(HAVE_STRLCAT,1,[Have strlcat]),
AM_CONDITIONAL(HAVE_STRLCAT, false)) AM_CONDITIONAL(HAVE_STRLCAT, false))
AC_CHECK_FUNCS([fmemopen],
AM_CONDITIONAL(HAVE_FMEMOPEN, true)
AC_DEFINE(HAVE_FMEMOPEN,1,[Have fmemopen]),
AM_CONDITIONAL(HAVE_FMEMOPEN, false))
# HAVE_STRUCT_RTNL_LINK_STATS64={0,1} # HAVE_STRUCT_RTNL_LINK_STATS64={0,1}
AC_CHECK_TYPES([struct rtnl_link_stats64], [], [], [[#include <linux/if_link.h>]]) AC_CHECK_TYPES([struct rtnl_link_stats64], [], [], [[#include <linux/if_link.h>]])
......
src/lxc/cgroups/cgfsng.c
...@@ -77,12 +77,10 @@ static int append_null_to_list(void ***list) ...@@ -77,12 +77,10 @@ static int append_null_to_list(void ***list)
*/ */
static bool string_in_list(char **list, const char *entry) static bool string_in_list(char **list, const char *entry)
{ {
int i;
if (!list) if (!list)
return false; return false;
for (i = 0; list[i]; i++) for (int i = 0; list[i]; i++)
if (strcmp(list[i], entry) == 0) if (strcmp(list[i], entry) == 0)
return true; return true;
...@@ -147,16 +145,10 @@ static void must_append_controller(char **klist, char **nlist, char ***clist, ...@@ -147,16 +145,10 @@ static void must_append_controller(char **klist, char **nlist, char ***clist,
*/ */
struct hierarchy *get_hierarchy(struct cgroup_ops *ops, const char *controller) struct hierarchy *get_hierarchy(struct cgroup_ops *ops, const char *controller)
{ {
int i; if (!ops->hierarchies)
return log_trace_errno(NULL, errno, "There are no useable cgroup controllers");
errno = ENOENT;
if (!ops->hierarchies) {
TRACE("There are no useable cgroup controllers");
return NULL;
}
for (i = 0; ops->hierarchies[i]; i++) { for (int i = 0; ops->hierarchies[i]; i++) {
if (!controller) { if (!controller) {
/* This is the empty unified hierarchy. */ /* This is the empty unified hierarchy. */
if (ops->hierarchies[i]->controllers && if (ops->hierarchies[i]->controllers &&
...@@ -179,7 +171,7 @@ struct hierarchy *get_hierarchy(struct cgroup_ops *ops, const char *controller) ...@@ -179,7 +171,7 @@ struct hierarchy *get_hierarchy(struct cgroup_ops *ops, const char *controller)
else else
WARN("There is no empty unified cgroup hierarchy"); WARN("There is no empty unified cgroup hierarchy");
return NULL; return ret_set_errno(NULL, ENOENT);
} }
#define BATCH_SIZE 50 #define BATCH_SIZE 50
...@@ -188,9 +180,8 @@ static void batch_realloc(char **mem, size_t oldlen, size_t newlen) ...@@ -188,9 +180,8 @@ static void batch_realloc(char **mem, size_t oldlen, size_t newlen)
int newbatches = (newlen / BATCH_SIZE) + 1; int newbatches = (newlen / BATCH_SIZE) + 1;
int oldbatches = (oldlen / BATCH_SIZE) + 1; int oldbatches = (oldlen / BATCH_SIZE) + 1;
if (!*mem || newbatches > oldbatches) { if (!*mem || newbatches > oldbatches)
*mem = must_realloc(*mem, newbatches * BATCH_SIZE); *mem = must_realloc(*mem, newbatches * BATCH_SIZE);
}
} }
static void append_line(char **dest, size_t oldlen, char *new, size_t newlen) static void append_line(char **dest, size_t oldlen, char *new, size_t newlen)
...@@ -205,20 +196,21 @@ static void append_line(char **dest, size_t oldlen, char *new, size_t newlen) ...@@ -205,20 +196,21 @@ static void append_line(char **dest, size_t oldlen, char *new, size_t newlen)
/* Slurp in a whole file */ /* Slurp in a whole file */
static char *read_file(const char *fnam) static char *read_file(const char *fnam)
{ {
__do_free char *line = NULL; __do_free char *buf = NULL, *line = NULL;
__do_fclose FILE *f = NULL; __do_fclose FILE *f = NULL;
int linelen;
char *buf = NULL;
size_t len = 0, fulllen = 0; size_t len = 0, fulllen = 0;
int linelen;
f = fopen(fnam, "re"); f = fopen(fnam, "re");
if (!f) if (!f)
return NULL; return NULL;
while ((linelen = getline(&line, &len, f)) != -1) { while ((linelen = getline(&line, &len, f)) != -1) {
append_line(&buf, fulllen, line, linelen); append_line(&buf, fulllen, line, linelen);
fulllen += linelen; fulllen += linelen;
} }
return buf;
return move_ptr(buf);
} }
/* Taken over modified from the kernel sources. */ /* Taken over modified from the kernel sources. */
...@@ -251,9 +243,9 @@ static bool is_set(unsigned bit, uint32_t *bitarr) ...@@ -251,9 +243,9 @@ static bool is_set(unsigned bit, uint32_t *bitarr)
*/ */
static uint32_t *lxc_cpumask(char *buf, size_t nbits) static uint32_t *lxc_cpumask(char *buf, size_t nbits)
{ {
__do_free uint32_t *bitarr = NULL;
char *token; char *token;
size_t arrlen; size_t arrlen;
__do_free uint32_t *bitarr = NULL;
arrlen = BITS_TO_LONGS(nbits); arrlen = BITS_TO_LONGS(nbits);
bitarr = calloc(arrlen, sizeof(uint32_t)); bitarr = calloc(arrlen, sizeof(uint32_t));
...@@ -287,36 +279,27 @@ static uint32_t *lxc_cpumask(char *buf, size_t nbits) ...@@ -287,36 +279,27 @@ static uint32_t *lxc_cpumask(char *buf, size_t nbits)
/* Turn cpumask into simple, comma-separated cpulist. */ /* Turn cpumask into simple, comma-separated cpulist. */
static char *lxc_cpumask_to_cpulist(uint32_t *bitarr, size_t nbits) static char *lxc_cpumask_to_cpulist(uint32_t *bitarr, size_t nbits)
{ {
int ret; __do_free_string_list char **cpulist = NULL;
size_t i;
char *tmp = NULL;
char **cpulist = NULL;
char numstr[INTTYPE_TO_STRLEN(size_t)] = {0}; char numstr[INTTYPE_TO_STRLEN(size_t)] = {0};
int ret;
for (i = 0; i <= nbits; i++) { for (size_t i = 0; i <= nbits; i++) {
if (!is_set(i, bitarr)) if (!is_set(i, bitarr))
continue; continue;
ret = snprintf(numstr, sizeof(numstr), "%zu", i); ret = snprintf(numstr, sizeof(numstr), "%zu", i);
if (ret < 0 || (size_t)ret >= sizeof(numstr)) { if (ret < 0 || (size_t)ret >= sizeof(numstr))
lxc_free_array((void **)cpulist, free);
return NULL; return NULL;
}
ret = lxc_append_string(&cpulist, numstr); ret = lxc_append_string(&cpulist, numstr);
if (ret < 0) { if (ret < 0)
lxc_free_array((void **)cpulist, free);
return ret_set_errno(NULL, ENOMEM); return ret_set_errno(NULL, ENOMEM);
}
} }
if (!cpulist) if (!cpulist)
return ret_set_errno(NULL, ENOMEM); return ret_set_errno(NULL, ENOMEM);
tmp = lxc_string_join(",", (const char **)cpulist, false); return lxc_string_join(",", (const char **)cpulist, false);
lxc_free_array((void **)cpulist, free);
return tmp;
} }
static ssize_t get_max_cpus(char *cpulist) static ssize_t get_max_cpus(char *cpulist)
...@@ -478,26 +461,22 @@ static bool copy_parent_file(const char *parent_cgroup, ...@@ -478,26 +461,22 @@ static bool copy_parent_file(const char *parent_cgroup,
parent_file = must_make_path(parent_cgroup, file, NULL); parent_file = must_make_path(parent_cgroup, file, NULL);
len = lxc_read_from_file(parent_file, NULL, 0); len = lxc_read_from_file(parent_file, NULL, 0);
if (len <= 0) if (len <= 0)
return log_error_errno(false, errno, return log_error_errno(false, errno, "Failed to determine buffer size");
"Failed to determine buffer size");
value = must_realloc(NULL, len + 1); value = must_realloc(NULL, len + 1);
value[len] = '\0'; value[len] = '\0';
ret = lxc_read_from_file(parent_file, value, len); ret = lxc_read_from_file(parent_file, value, len);
if (ret != len) if (ret != len)
return log_error_errno(false, errno, return log_error_errno(false, errno, "Failed to read from parent file \"%s\"", parent_file);
"Failed to read from parent file \"%s\"",
parent_file);
ret = lxc_write_openat(child_cgroup, file, value, len); ret = lxc_write_openat(child_cgroup, file, value, len);
if (ret < 0 && errno != EACCES) if (ret < 0 && errno != EACCES)
return log_error_errno(false, return log_error_errno(false, errno, "Failed to write \"%s\" to file \"%s/%s\"",
errno, "Failed to write \"%s\" to file \"%s/%s\"",
value, child_cgroup, file); value, child_cgroup, file);
return true; return true;
} }
static bool is_unified_hierarchy(const struct hierarchy *h) static inline bool is_unified_hierarchy(const struct hierarchy *h)
{ {
return h->version == CGROUP2_SUPER_MAGIC; return h->version == CGROUP2_SUPER_MAGIC;
} }
...@@ -587,15 +566,12 @@ static int cg_legacy_handle_cpuset_hierarchy(struct hierarchy *h, ...@@ -587,15 +566,12 @@ static int cg_legacy_handle_cpuset_hierarchy(struct hierarchy *h,
*/ */
static bool controller_lists_intersect(char **l1, char **l2) static bool controller_lists_intersect(char **l1, char **l2)
{ {
int i;
if (!l1 || !l2) if (!l1 || !l2)
return false; return false;
for (i = 0; l1[i]; i++) { for (int i = 0; l1[i]; i++)
if (string_in_list(l2, l1[i])) if (string_in_list(l2, l1[i]))
return true; return true;
}
return false; return false;
} }
...@@ -606,12 +582,10 @@ static bool controller_lists_intersect(char **l1, char **l2) ...@@ -606,12 +582,10 @@ static bool controller_lists_intersect(char **l1, char **l2)
*/ */
static bool controller_list_is_dup(struct hierarchy **hlist, char **clist) static bool controller_list_is_dup(struct hierarchy **hlist, char **clist)
{ {
int i;
if (!hlist) if (!hlist)
return false; return false;
for (i = 0; hlist[i]; i++) for (int i = 0; hlist[i]; i++)
if (controller_lists_intersect(hlist[i]->controllers, clist)) if (controller_lists_intersect(hlist[i]->controllers, clist))
return true; return true;
...@@ -623,12 +597,10 @@ static bool controller_list_is_dup(struct hierarchy **hlist, char **clist) ...@@ -623,12 +597,10 @@ static bool controller_list_is_dup(struct hierarchy **hlist, char **clist)
*/ */
static bool controller_found(struct hierarchy **hlist, char *entry) static bool controller_found(struct hierarchy **hlist, char *entry)
{ {
int i;
if (!hlist) if (!hlist)
return false; return false;
for (i = 0; hlist[i]; i++) for (int i = 0; hlist[i]; i++)
if (string_in_list(hlist[i]->controllers, entry)) if (string_in_list(hlist[i]->controllers, entry))
return true; return true;
...@@ -640,17 +612,15 @@ static bool controller_found(struct hierarchy **hlist, char *entry) ...@@ -640,17 +612,15 @@ static bool controller_found(struct hierarchy **hlist, char *entry)
*/ */
static bool all_controllers_found(struct cgroup_ops *ops) static bool all_controllers_found(struct cgroup_ops *ops)
{ {
char **cur; struct hierarchy **hlist;
struct hierarchy **hlist = ops->hierarchies;
if (!ops->cgroup_use) if (!ops->cgroup_use)
return true; return true;
for (cur = ops->cgroup_use; cur && *cur; cur++) hlist = ops->hierarchies;
if (!controller_found(hlist, *cur)) { for (char **cur = ops->cgroup_use; cur && *cur; cur++)
ERROR("No %s controller mountpoint found", *cur); if (!controller_found(hlist, *cur))
return false; return log_error(false, "No %s controller mountpoint found", *cur);
}
return true; return true;
} }
...@@ -666,10 +636,10 @@ static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line, ...@@ -666,10 +636,10 @@ static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line,
/* The fourth field is /sys/fs/cgroup/comma-delimited-controller-list /* The fourth field is /sys/fs/cgroup/comma-delimited-controller-list
* for legacy hierarchies. * for legacy hierarchies.
*/ */
__do_free_string_list char **aret = NULL;
int i; int i;
char *p2, *tok; char *p2, *tok;
char *p = line, *sep = ","; char *p = line, *sep = ",";
char **aret = NULL;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
p = strchr(p, ' '); p = strchr(p, ' ');
...@@ -681,17 +651,13 @@ static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line, ...@@ -681,17 +651,13 @@ static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line,
/* Note, if we change how mountinfo works, then our caller will need to /* Note, if we change how mountinfo works, then our caller will need to
* verify /sys/fs/cgroup/ in this field. * verify /sys/fs/cgroup/ in this field.
*/ */
if (strncmp(p, DEFAULT_CGROUP_MOUNTPOINT "/", 15) != 0) { if (strncmp(p, DEFAULT_CGROUP_MOUNTPOINT "/", 15) != 0)
ERROR("Found hierarchy not under " DEFAULT_CGROUP_MOUNTPOINT ": \"%s\"", p); return log_error(NULL, "Found hierarchy not under " DEFAULT_CGROUP_MOUNTPOINT ": \"%s\"", p);
return NULL;
}
p += 15; p += 15;
p2 = strchr(p, ' '); p2 = strchr(p, ' ');
if (!p2) { if (!p2)
ERROR("Corrupt mountinfo"); return log_error(NULL, "Corrupt mountinfo");
return NULL;
}
*p2 = '\0'; *p2 = '\0';
if (type == CGROUP_SUPER_MAGIC) { if (type == CGROUP_SUPER_MAGIC) {
...@@ -710,24 +676,24 @@ static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line, ...@@ -710,24 +676,24 @@ static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line,
} }
*p2 = ' '; *p2 = ' ';
return aret; return move_ptr(aret);
} }
static char **cg_unified_make_empty_controller(void) static char **cg_unified_make_empty_controller(void)
{ {
__do_free_string_list char **aret = NULL;
int newentry; int newentry;
char **aret = NULL;
newentry = append_null_to_list((void ***)&aret); newentry = append_null_to_list((void ***)&aret);
aret[newentry] = NULL; aret[newentry] = NULL;
return aret; return move_ptr(aret);
} }
static char **cg_unified_get_controllers(const char *file) static char **cg_unified_get_controllers(const char *file)
{ {
__do_free char *buf = NULL; __do_free char *buf = NULL;
__do_free_string_list char **aret = NULL;
char *sep = " \t\n"; char *sep = " \t\n";
char **aret = NULL;
char *tok; char *tok;
buf = read_file(file); buf = read_file(file);
...@@ -743,7 +709,7 @@ static char **cg_unified_get_controllers(const char *file) ...@@ -743,7 +709,7 @@ static char **cg_unified_get_controllers(const char *file)
aret[newentry] = copy; aret[newentry] = copy;
} }
return aret; return move_ptr(aret);
} }
static struct hierarchy *add_hierarchy(struct hierarchy ***h, char **clist, char *mountpoint, static struct hierarchy *add_hierarchy(struct hierarchy ***h, char **clist, char *mountpoint,
...@@ -770,12 +736,11 @@ static struct hierarchy *add_hierarchy(struct hierarchy ***h, char **clist, char ...@@ -770,12 +736,11 @@ static struct hierarchy *add_hierarchy(struct hierarchy ***h, char **clist, char
*/ */
static char *cg_hybrid_get_mountpoint(char *line) static char *cg_hybrid_get_mountpoint(char *line)
{ {
int i; char *p = line, *sret = NULL;
size_t len; size_t len;
char *p2; char *p2;
char *p = line, *sret = NULL;
for (i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
p = strchr(p, ' '); p = strchr(p, ' ');
if (!p) if (!p)
return NULL; return NULL;
...@@ -794,15 +759,17 @@ static char *cg_hybrid_get_mountpoint(char *line) ...@@ -794,15 +759,17 @@ static char *cg_hybrid_get_mountpoint(char *line)
sret = must_realloc(NULL, len + 1); sret = must_realloc(NULL, len + 1);
memcpy(sret, p, len); memcpy(sret, p, len);
sret[len] = '\0'; sret[len] = '\0';
return sret; return sret;
} }
/* Given a multi-line string, return a null-terminated copy of the current line. */ /* Given a multi-line string, return a null-terminated copy of the current line. */
static char *copy_to_eol(char *p) static char *copy_to_eol(char *p)
{ {
char *p2 = strchr(p, '\n'), *sret; char *p2, *sret;
size_t len; size_t len;
p2 = strchr(p, '\n');
if (!p2) if (!p2)
return NULL; return NULL;
...@@ -810,6 +777,7 @@ static char *copy_to_eol(char *p) ...@@ -810,6 +777,7 @@ static char *copy_to_eol(char *p)
sret = must_realloc(NULL, len + 1); sret = must_realloc(NULL, len + 1);
memcpy(sret, p, len); memcpy(sret, p, len);
sret[len] = '\0'; sret[len] = '\0';
return sret; return sret;
} }
...@@ -982,8 +950,8 @@ static int cgroup_rmdir(struct hierarchy **hierarchies, ...@@ -982,8 +950,8 @@ static int cgroup_rmdir(struct hierarchy **hierarchies,
return 0; return 0;
for (int i = 0; hierarchies[i]; i++) { for (int i = 0; hierarchies[i]; i++) {
int ret;
struct hierarchy *h = hierarchies[i]; struct hierarchy *h = hierarchies[i];
int ret;
if (!h->container_full_path) if (!h->container_full_path)
continue; continue;
...@@ -992,8 +960,7 @@ static int cgroup_rmdir(struct hierarchy **hierarchies, ...@@ -992,8 +960,7 @@ static int cgroup_rmdir(struct hierarchy **hierarchies,
if (ret < 0) if (ret < 0)
WARN("Failed to destroy \"%s\"", h->container_full_path); WARN("Failed to destroy \"%s\"", h->container_full_path);
free(h->container_full_path); free_disarm(h->container_full_path);
h->container_full_path = NULL;
} }
return 0; return 0;
...@@ -1019,14 +986,12 @@ static int cgroup_rmdir_wrapper(void *data) ...@@ -1019,14 +986,12 @@ static int cgroup_rmdir_wrapper(void *data)
ret = setresgid(nsgid, nsgid, nsgid); ret = setresgid(nsgid, nsgid, nsgid);
if (ret < 0) if (ret < 0)
return log_error_errno(-1, errno, return log_error_errno(-1, errno, "Failed to setresgid(%d, %d, %d)",
"Failed to setresgid(%d, %d, %d)",
(int)nsgid, (int)nsgid, (int)nsgid); (int)nsgid, (int)nsgid, (int)nsgid);
ret = setresuid(nsuid, nsuid, nsuid); ret = setresuid(nsuid, nsuid, nsuid);
if (ret < 0) if (ret < 0)
return log_error_errno(-1, errno, return log_error_errno(-1, errno, "Failed to setresuid(%d, %d, %d)",
"Failed to setresuid(%d, %d, %d)",
(int)nsuid, (int)nsuid, (int)nsuid); (int)nsuid, (int)nsuid, (int)nsuid);
return cgroup_rmdir(arg->hierarchies, arg->container_cgroup); return cgroup_rmdir(arg->hierarchies, arg->container_cgroup);
...@@ -1057,10 +1022,10 @@ __cgfsng_ops static void cgfsng_payload_destroy(struct cgroup_ops *ops, ...@@ -1057,10 +1022,10 @@ __cgfsng_ops static void cgfsng_payload_destroy(struct cgroup_ops *ops,
if (handler->conf && !lxc_list_empty(&handler->conf->id_map)) { if (handler->conf && !lxc_list_empty(&handler->conf->id_map)) {
struct generic_userns_exec_data wrap = { struct generic_userns_exec_data wrap = {
.origuid = 0, .conf = handler->conf,
.container_cgroup = ops->container_cgroup, .container_cgroup = ops->container_cgroup,
.hierarchies = ops->hierarchies, .hierarchies = ops->hierarchies,
.conf = handler->conf, .origuid = 0,
}; };
ret = userns_exec_1(handler->conf, cgroup_rmdir_wrapper, &wrap, ret = userns_exec_1(handler->conf, cgroup_rmdir_wrapper, &wrap,
"cgroup_rmdir_wrapper"); "cgroup_rmdir_wrapper");
...@@ -1146,19 +1111,14 @@ static int mkdir_eexist_on_last(const char *dir, mode_t mode) ...@@ -1146,19 +1111,14 @@ static int mkdir_eexist_on_last(const char *dir, mode_t mode)
dir = tmp + strspn(tmp, "/"); dir = tmp + strspn(tmp, "/");
tmp = dir + strcspn(dir, "/"); tmp = dir + strcspn(dir, "/");
errno = ENOMEM;
cur_len = dir - orig; cur_len = dir - orig;
makeme = strndup(orig, cur_len); makeme = strndup(orig, cur_len);
if (!makeme) if (!makeme)
return -1; return ret_set_errno(-1, ENOMEM);
ret = mkdir(makeme, mode); ret = mkdir(makeme, mode);
if (ret < 0) { if (ret < 0 && ((errno != EEXIST) || (orig_len == cur_len)))
if ((errno != EEXIST) || (orig_len == cur_len)) { return log_error_errno(-1, errno, "Failed to create directory \"%s\"", makeme);
SYSERROR("Failed to create directory \"%s\"", makeme);
return -1;
}
}
} while (tmp != dir); } while (tmp != dir);
return 0; return 0;
...@@ -1500,14 +1460,12 @@ static int chown_cgroup_wrapper(void *data) ...@@ -1500,14 +1460,12 @@ static int chown_cgroup_wrapper(void *data)
ret = setresgid(nsgid, nsgid, nsgid); ret = setresgid(nsgid, nsgid, nsgid);
if (ret < 0) if (ret < 0)
return log_error_errno(-1, errno, return log_error_errno(-1, errno, "Failed to setresgid(%d, %d, %d)",
"Failed to setresgid(%d, %d, %d)",
(int)nsgid, (int)nsgid, (int)nsgid); (int)nsgid, (int)nsgid, (int)nsgid);
ret = setresuid(nsuid, nsuid, nsuid); ret = setresuid(nsuid, nsuid, nsuid);
if (ret < 0) if (ret < 0)
return log_error_errno(-1, errno, return log_error_errno(-1, errno, "Failed to setresuid(%d, %d, %d)",
"Failed to setresuid(%d, %d, %d)",
(int)nsuid, (int)nsuid, (int)nsuid); (int)nsuid, (int)nsuid, (int)nsuid);
destuid = get_ns_uid(arg->origuid); destuid = get_ns_uid(arg->origuid);
...@@ -1595,12 +1553,9 @@ __cgfsng_ops void cgfsng_payload_finalize(struct cgroup_ops *ops) ...@@ -1595,12 +1553,9 @@ __cgfsng_ops void cgfsng_payload_finalize(struct cgroup_ops *ops)
} }
/* cgroup-full:* is done, no need to create subdirs */ /* cgroup-full:* is done, no need to create subdirs */
static bool cg_mount_needs_subdirs(int type) static inline bool cg_mount_needs_subdirs(int type)
{ {
if (type >= LXC_AUTO_CGROUP_FULL_RO) return !(type >= LXC_AUTO_CGROUP_FULL_RO);
return false;
return true;
} }
/* After $rootfs/sys/fs/container/controller/the/cg/path has been created, /* After $rootfs/sys/fs/container/controller/the/cg/path has been created,
...@@ -1617,11 +1572,9 @@ static int cg_legacy_mount_controllers(int type, struct hierarchy *h, ...@@ -1617,11 +1572,9 @@ static int cg_legacy_mount_controllers(int type, struct hierarchy *h,
if (type == LXC_AUTO_CGROUP_RO || type == LXC_AUTO_CGROUP_MIXED) { if (type == LXC_AUTO_CGROUP_RO || type == LXC_AUTO_CGROUP_MIXED) {
ret = mount(controllerpath, controllerpath, "cgroup", MS_BIND, NULL); ret = mount(controllerpath, controllerpath, "cgroup", MS_BIND, NULL);
if (ret < 0) { if (ret < 0)
SYSERROR("Failed to bind mount \"%s\" onto \"%s\"", return log_error_errno(-1, errno, "Failed to bind mount \"%s\" onto \"%s\"",
controllerpath, controllerpath); controllerpath, controllerpath);
return -1;
}
remount_flags = add_required_remount_flags(controllerpath, remount_flags = add_required_remount_flags(controllerpath,
controllerpath, controllerpath,
...@@ -1629,10 +1582,8 @@ static int cg_legacy_mount_controllers(int type, struct hierarchy *h, ...@@ -1629,10 +1582,8 @@ static int cg_legacy_mount_controllers(int type, struct hierarchy *h,
ret = mount(controllerpath, controllerpath, "cgroup", ret = mount(controllerpath, controllerpath, "cgroup",
remount_flags | MS_REMOUNT | MS_BIND | MS_RDONLY, remount_flags | MS_REMOUNT | MS_BIND | MS_RDONLY,
NULL); NULL);
if (ret < 0) { if (ret < 0)
SYSERROR("Failed to remount \"%s\" ro", controllerpath); return log_error_errno(-1, errno, "Failed to remount \"%s\" ro", controllerpath);
return -1;
}
INFO("Remounted %s read-only", controllerpath); INFO("Remounted %s read-only", controllerpath);
} }
...@@ -1643,20 +1594,17 @@ static int cg_legacy_mount_controllers(int type, struct hierarchy *h, ...@@ -1643,20 +1594,17 @@ static int cg_legacy_mount_controllers(int type, struct hierarchy *h,
flags |= MS_RDONLY; flags |= MS_RDONLY;
ret = mount(sourcepath, cgpath, "cgroup", flags, NULL); ret = mount(sourcepath, cgpath, "cgroup", flags, NULL);
if (ret < 0) { if (ret < 0)
SYSERROR("Failed to mount \"%s\" onto \"%s\"", h->controllers[0], cgpath); return log_error_errno(-1, errno, "Failed to mount \"%s\" onto \"%s\"",
return -1; h->controllers[0], cgpath);
}
INFO("Mounted \"%s\" onto \"%s\"", h->controllers[0], cgpath); INFO("Mounted \"%s\" onto \"%s\"", h->controllers[0], cgpath);
if (flags & MS_RDONLY) { if (flags & MS_RDONLY) {
remount_flags = add_required_remount_flags(sourcepath, cgpath, remount_flags = add_required_remount_flags(sourcepath, cgpath,
flags | MS_REMOUNT); flags | MS_REMOUNT);
ret = mount(sourcepath, cgpath, "cgroup", remount_flags, NULL); ret = mount(sourcepath, cgpath, "cgroup", remount_flags, NULL);
if (ret < 0) { if (ret < 0)
SYSERROR("Failed to remount \"%s\" ro", cgpath); return log_error_errno(-1, errno, "Failed to remount \"%s\" ro", cgpath);
return -1;
}
INFO("Remounted %s read-only", cgpath); INFO("Remounted %s read-only", cgpath);
} }
...@@ -1694,10 +1642,9 @@ static int __cg_mount_direct(int type, struct hierarchy *h, ...@@ -1694,10 +1642,9 @@ static int __cg_mount_direct(int type, struct hierarchy *h,
} }
ret = mount("cgroup", controllerpath, fstype, flags, controllers); ret = mount("cgroup", controllerpath, fstype, flags, controllers);
if (ret < 0) { if (ret < 0)
SYSERROR("Failed to mount \"%s\" with cgroup filesystem type %s", controllerpath, fstype); return log_error_errno(-1, errno, "Failed to mount \"%s\" with cgroup filesystem type %s",
return -1; controllerpath, fstype);
}
DEBUG("Mounted \"%s\" with cgroup filesystem type %s", controllerpath, fstype); DEBUG("Mounted \"%s\" with cgroup filesystem type %s", controllerpath, fstype);
return 0; return 0;
...@@ -1861,9 +1808,7 @@ __cgfsng_ops static bool cgfsng_escape(const struct cgroup_ops *ops, ...@@ -1861,9 +1808,7 @@ __cgfsng_ops static bool cgfsng_escape(const struct cgroup_ops *ops,
"cgroup.procs", NULL); "cgroup.procs", NULL);
ret = lxc_write_to_file(fullpath, "0", 2, false, 0666); ret = lxc_write_to_file(fullpath, "0", 2, false, 0666);
if (ret != 0) if (ret != 0)
return log_error_errno(false, return log_error_errno(false, errno, "Failed to escape to cgroup \"%s\"", fullpath);
errno, "Failed to escape to cgroup \"%s\"",
fullpath);
} }
return true; return true;
...@@ -1894,7 +1839,7 @@ __cgfsng_ops static bool cgfsng_get_hierarchies(struct cgroup_ops *ops, int n, ...@@ -1894,7 +1839,7 @@ __cgfsng_ops static bool cgfsng_get_hierarchies(struct cgroup_ops *ops, int n,
return ret_set_errno(false, ENOENT); return ret_set_errno(false, ENOENT);
if (!ops->hierarchies) if (!ops->hierarchies)
return false; return ret_set_errno(false, ENOENT);
/* sanity check n */ /* sanity check n */
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
...@@ -2083,8 +2028,7 @@ __cgfsng_ops static const char *cgfsng_get_cgroup(struct cgroup_ops *ops, ...@@ -2083,8 +2028,7 @@ __cgfsng_ops static const char *cgfsng_get_cgroup(struct cgroup_ops *ops,
h = get_hierarchy(ops, controller); h = get_hierarchy(ops, controller);
if (!h) if (!h)
return log_warn_errno(NULL, return log_warn_errno(NULL, ENOENT, "Failed to find hierarchy for controller \"%s\"",
ENOENT, "Failed to find hierarchy for controller \"%s\"",
controller ? controller : "(null)"); controller ? controller : "(null)");
return h->container_full_path return h->container_full_path
...@@ -2235,8 +2179,7 @@ __cgfsng_ops static bool cgfsng_attach(struct cgroup_ops *ops, const char *name, ...@@ -2235,8 +2179,7 @@ __cgfsng_ops static bool cgfsng_attach(struct cgroup_ops *ops, const char *name,
fullpath = build_full_cgpath_from_monitorpath(h, path, "cgroup.procs"); fullpath = build_full_cgpath_from_monitorpath(h, path, "cgroup.procs");
ret = lxc_write_to_file(fullpath, pidstr, len, false, 0666); ret = lxc_write_to_file(fullpath, pidstr, len, false, 0666);
if (ret < 0) if (ret < 0)
return log_error_errno(false, errno, return log_error_errno(false, errno, "Failed to attach %d to %s",
"Failed to attach %d to %s",
(int)pid, fullpath); (int)pid, fullpath);
} }
...@@ -2327,10 +2270,11 @@ static int device_cgroup_rule_parse(struct device_item *device, const char *key, ...@@ -2327,10 +2270,11 @@ static int device_cgroup_rule_parse(struct device_item *device, const char *key,
: LXC_BPF_DEVICE_CGROUP_WHITELIST; : LXC_BPF_DEVICE_CGROUP_WHITELIST;
device->allow = -1; device->allow = -1;
return 0; return 0;
} else {
device->global_rule = LXC_BPF_DEVICE_CGROUP_LOCAL_RULE;
} }
/* local rule */
device->global_rule = LXC_BPF_DEVICE_CGROUP_LOCAL_RULE;
switch (*val) { switch (*val) {
case 'a': case 'a':
__fallthrough; __fallthrough;
...@@ -2506,9 +2450,7 @@ static int device_cgroup_rule_parse_devpath(struct device_item *device, ...@@ -2506,9 +2450,7 @@ static int device_cgroup_rule_parse_devpath(struct device_item *device,
device->type = 'c'; device->type = 'c';
break; break;
default: default:
return log_error_errno(-1, EINVAL, return log_error_errno(-1, EINVAL, "Unsupported device type %i for \"%s\"", m, path);
"Unsupported device type %i for \"%s\"",
m, path);
} }
device->major = MAJOR(sb.st_rdev); device->major = MAJOR(sb.st_rdev);
...@@ -2531,10 +2473,8 @@ static int convert_devpath(const char *invalue, char *dest) ...@@ -2531,10 +2473,8 @@ static int convert_devpath(const char *invalue, char *dest)
ret = snprintf(dest, 50, "%c %d:%d %s", device.type, device.major, ret = snprintf(dest, 50, "%c %d:%d %s", device.type, device.major,
device.minor, device.access); device.minor, device.access);
if (ret < 0 || ret >= 50) if (ret < 0 || ret >= 50)
return log_error_errno(-1, return log_error_errno(-1, ENAMETOOLONG, "Error on configuration value \"%c %d:%d %s\" (max 50 chars)",
ENAMETOOLONG, "Error on configuration value \"%c %d:%d %s\" (max 50 chars)", device.type, device.major, device.minor, device.access);
device.type, device.major, device.minor,
device.access);
return 0; return 0;
} }
...@@ -2566,14 +2506,8 @@ static int cg_legacy_set_data(struct cgroup_ops *ops, const char *filename, ...@@ -2566,14 +2506,8 @@ static int cg_legacy_set_data(struct cgroup_ops *ops, const char *filename,
} }
h = get_hierarchy(ops, controller); h = get_hierarchy(ops, controller);
if (!h) { if (!h)
ERROR("Failed to setup limits for the \"%s\" controller. " return log_error_errno(-ENOENT, ENOENT, "Failed to setup limits for the \"%s\" controller. The controller seems to be unused by \"cgfsng\" cgroup driver or not enabled on the cgroup hierarchy", controller);
"The controller seems to be unused by \"cgfsng\" cgroup "
"driver or not enabled on the cgroup hierarchy",
controller);
errno = ENOENT;
return -ENOENT;
}
return lxc_write_openat(h->container_full_path, filename, value, strlen(value)); return lxc_write_openat(h->container_full_path, filename, value, strlen(value));
} }
...@@ -2611,15 +2545,12 @@ __cgfsng_ops static bool cgfsng_setup_limits_legacy(struct cgroup_ops *ops, ...@@ -2611,15 +2545,12 @@ __cgfsng_ops static bool cgfsng_setup_limits_legacy(struct cgroup_ops *ops,
if (do_devices == !strncmp("devices", cg->subsystem, 7)) { if (do_devices == !strncmp("devices", cg->subsystem, 7)) {
if (cg_legacy_set_data(ops, cg->subsystem, cg->value)) { if (cg_legacy_set_data(ops, cg->subsystem, cg->value)) {
if (do_devices && (errno == EACCES || errno == EPERM)) if (do_devices && (errno == EACCES || errno == EPERM))
log_warn_errno(continue, log_warn_errno(continue, errno, "Failed to set \"%s\" to \"%s\"",
errno, "Failed to set \"%s\" to \"%s\"",
cg->subsystem, cg->value); cg->subsystem, cg->value);
log_warn_errno(goto out, errno, log_warn_errno(goto out, errno, "Failed to set \"%s\" to \"%s\"",
"Failed to set \"%s\" to \"%s\"",
cg->subsystem, cg->value); cg->subsystem, cg->value);
} }
DEBUG("Set controller \"%s\" set to \"%s\"", DEBUG("Set controller \"%s\" set to \"%s\"", cg->subsystem, cg->value);
cg->subsystem, cg->value);
} }
} }
...@@ -2651,9 +2582,7 @@ static int bpf_device_cgroup_prepare(struct cgroup_ops *ops, ...@@ -2651,9 +2582,7 @@ static int bpf_device_cgroup_prepare(struct cgroup_ops *ops,
else else
ret = device_cgroup_rule_parse(&device_item, key, val); ret = device_cgroup_rule_parse(&device_item, key, val);
if (ret < 0) if (ret < 0)
return log_error_errno(-1, EINVAL, return log_error_errno(-1, EINVAL, "Failed to parse device string %s=%s", key, val);
"Failed to parse device string %s=%s",
key, val);
ret = bpf_list_add_device(conf, &device_item); ret = bpf_list_add_device(conf, &device_item);
if (ret < 0) if (ret < 0)
...@@ -2702,8 +2631,7 @@ __cgfsng_ops static bool cgfsng_setup_limits(struct cgroup_ops *ops, ...@@ -2702,8 +2631,7 @@ __cgfsng_ops static bool cgfsng_setup_limits(struct cgroup_ops *ops,
cg->subsystem, cg->value, cg->subsystem, cg->value,
strlen(cg->value)); strlen(cg->value));
if (ret < 0) if (ret < 0)
return log_error_errno(false, return log_error_errno(false, errno, "Failed to set \"%s\" to \"%s\"",
errno, "Failed to set \"%s\" to \"%s\"",
cg->subsystem, cg->value); cg->subsystem, cg->value);
} }
TRACE("Set \"%s\" to \"%s\"", cg->subsystem, cg->value); TRACE("Set \"%s\" to \"%s\"", cg->subsystem, cg->value);
...@@ -2743,40 +2671,42 @@ __cgfsng_ops bool cgfsng_devices_activate(struct cgroup_ops *ops, ...@@ -2743,40 +2671,42 @@ __cgfsng_ops bool cgfsng_devices_activate(struct cgroup_ops *ops,
devices = bpf_program_new(BPF_PROG_TYPE_CGROUP_DEVICE); devices = bpf_program_new(BPF_PROG_TYPE_CGROUP_DEVICE);
if (!devices) if (!devices)
return log_error_errno(false, ENOMEM, return log_error_errno(false, ENOMEM, "Failed to create new bpf program");
"Failed to create new bpf program");
ret = bpf_program_init(devices); ret = bpf_program_init(devices);
if (ret) if (ret)
return log_error_errno(false, ENOMEM, return log_error_errno(false, ENOMEM, "Failed to initialize bpf program");
"Failed to initialize bpf program");
lxc_list_for_each(it, &conf->devices) { lxc_list_for_each(it, &conf->devices) {
struct device_item *cur = it->elem; struct device_item *cur = it->elem;
ret = bpf_program_append_device(devices, cur); ret = bpf_program_append_device(devices, cur);
if (ret) if (ret)
return log_error_errno(false, return log_error_errno(false, ENOMEM, "Failed to add new rule to bpf device program: type %c, major %d, minor %d, access %s, allow %d, global_rule %d",
ENOMEM, "Failed to add new rule to bpf device program: type %c, major %d, minor %d, access %s, allow %d, global_rule %d", cur->type,
cur->type, cur->major, cur->major,
cur->minor, cur->access, cur->minor,
cur->allow, cur->global_rule); cur->access,
cur->allow,
cur->global_rule);
TRACE("Added rule to bpf device program: type %c, major %d, minor %d, access %s, allow %d, global_rule %d", TRACE("Added rule to bpf device program: type %c, major %d, minor %d, access %s, allow %d, global_rule %d",
cur->type, cur->major, cur->minor, cur->access, cur->type,
cur->allow, cur->global_rule); cur->major,
cur->minor,
cur->access,
cur->allow,
cur->global_rule);
} }
ret = bpf_program_finalize(devices); ret = bpf_program_finalize(devices);
if (ret) if (ret)
return log_error_errno(false, ENOMEM, return log_error_errno(false, ENOMEM, "Failed to finalize bpf program");
"Failed to finalize bpf program");
ret = bpf_program_cgroup_attach(devices, BPF_CGROUP_DEVICE, ret = bpf_program_cgroup_attach(devices, BPF_CGROUP_DEVICE,
unified->container_full_path, unified->container_full_path,
BPF_F_ALLOW_MULTI); BPF_F_ALLOW_MULTI);
if (ret) if (ret)
return log_error_errno(false, ENOMEM, return log_error_errno(false, ENOMEM, "Failed to attach bpf program");
"Failed to attach bpf program");
/* Replace old bpf program. */ /* Replace old bpf program. */
devices_old = move_ptr(conf->cgroup2_devices); devices_old = move_ptr(conf->cgroup2_devices);
...@@ -2789,12 +2719,11 @@ __cgfsng_ops bool cgfsng_devices_activate(struct cgroup_ops *ops, ...@@ -2789,12 +2719,11 @@ __cgfsng_ops bool cgfsng_devices_activate(struct cgroup_ops *ops,
bool __cgfsng_delegate_controllers(struct cgroup_ops *ops, const char *cgroup) bool __cgfsng_delegate_controllers(struct cgroup_ops *ops, const char *cgroup)
{ {
__do_free char *add_controllers = NULL, *base_path = NULL; __do_free char *add_controllers = NULL, *base_path = NULL;
__do_free_string_list char **parts = NULL;
struct hierarchy *unified = ops->unified; struct hierarchy *unified = ops->unified;
ssize_t parts_len; ssize_t parts_len;
char **it; char **it;
size_t full_len = 0; size_t full_len = 0;
char **parts = NULL;
bool bret = false;
if (!ops->hierarchies || !pure_unified_layout(ops) || if (!ops->hierarchies || !pure_unified_layout(ops) ||
!unified->controllers[0]) !unified->controllers[0])
...@@ -2822,7 +2751,7 @@ bool __cgfsng_delegate_controllers(struct cgroup_ops *ops, const char *cgroup) ...@@ -2822,7 +2751,7 @@ bool __cgfsng_delegate_controllers(struct cgroup_ops *ops, const char *cgroup)
parts = lxc_string_split(cgroup, '/'); parts = lxc_string_split(cgroup, '/');
if (!parts) if (!parts)
goto on_error; return false;
parts_len = lxc_array_len((void **)parts); parts_len = lxc_array_len((void **)parts);
if (parts_len > 0) if (parts_len > 0)
...@@ -2838,17 +2767,12 @@ bool __cgfsng_delegate_controllers(struct cgroup_ops *ops, const char *cgroup) ...@@ -2838,17 +2767,12 @@ bool __cgfsng_delegate_controllers(struct cgroup_ops *ops, const char *cgroup)
target = must_make_path(base_path, "cgroup.subtree_control", NULL); target = must_make_path(base_path, "cgroup.subtree_control", NULL);
ret = lxc_writeat(-1, target, add_controllers, full_len); ret = lxc_writeat(-1, target, add_controllers, full_len);
if (ret < 0) if (ret < 0)
log_error_errno(goto on_error, return log_error_errno(false, errno, "Could not enable \"%s\" controllers in the unified cgroup \"%s\"",
errno, "Could not enable \"%s\" controllers in the unified cgroup \"%s\"", add_controllers, target);
add_controllers, target);
TRACE("Enable \"%s\" controllers in the unified cgroup \"%s\"", add_controllers, target); TRACE("Enable \"%s\" controllers in the unified cgroup \"%s\"", add_controllers, target);
} }
bret = true; return true;
on_error:
lxc_free_array((void **)parts, free);
return bret;
} }
__cgfsng_ops bool cgfsng_monitor_delegate_controllers(struct cgroup_ops *ops) __cgfsng_ops bool cgfsng_monitor_delegate_controllers(struct cgroup_ops *ops)
...@@ -3130,6 +3054,7 @@ static int cg_unified_init(struct cgroup_ops *ops, bool relative, ...@@ -3130,6 +3054,7 @@ static int cg_unified_init(struct cgroup_ops *ops, bool relative,
ops->cgroup_layout = CGROUP_LAYOUT_UNIFIED; ops->cgroup_layout = CGROUP_LAYOUT_UNIFIED;
ops->unified = new; ops->unified = new;
return CGROUP2_SUPER_MAGIC; return CGROUP2_SUPER_MAGIC;
} }
......
src/lxc/file_utils.c
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <linux/magic.h> #include <linux/magic.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/sendfile.h> #include <sys/sendfile.h>
...@@ -469,6 +470,7 @@ char *file_to_buf(const char *path, size_t *length) ...@@ -469,6 +470,7 @@ char *file_to_buf(const char *path, size_t *length)
FILE *fopen_cached(const char *path, const char *mode, void **caller_freed_buffer) FILE *fopen_cached(const char *path, const char *mode, void **caller_freed_buffer)
{ {
#ifdef HAVE_FMEMOPEN
__do_free char *buf = NULL; __do_free char *buf = NULL;
size_t len = 0; size_t len = 0;
FILE *f; FILE *f;
...@@ -482,13 +484,17 @@ FILE *fopen_cached(const char *path, const char *mode, void **caller_freed_buffe ...@@ -482,13 +484,17 @@ FILE *fopen_cached(const char *path, const char *mode, void **caller_freed_buffe
return NULL; return NULL;
*caller_freed_buffer = move_ptr(buf); *caller_freed_buffer = move_ptr(buf);
return f; return f;
#else
return fopen(path, mode);
#endif
} }
FILE *fdopen_cached(int fd, const char *mode, void **caller_freed_buffer) FILE *fdopen_cached(int fd, const char *mode, void **caller_freed_buffer)
{ {
FILE *f;
#ifdef HAVE_FMEMOPEN
__do_free char *buf = NULL; __do_free char *buf = NULL;
size_t len = 0; size_t len = 0;
FILE *f;
buf = fd_to_buf(fd, &len); buf = fd_to_buf(fd, &len);
if (!buf) if (!buf)
...@@ -499,5 +505,21 @@ FILE *fdopen_cached(int fd, const char *mode, void **caller_freed_buffer) ...@@ -499,5 +505,21 @@ FILE *fdopen_cached(int fd, const char *mode, void **caller_freed_buffer)
return NULL; return NULL;
*caller_freed_buffer = move_ptr(buf); *caller_freed_buffer = move_ptr(buf);
#else
__do_close_prot_errno int dupfd = -EBADF;
dupfd = dup(fd);
if (dupfd < 0)
return NULL;
f = fdopen(dupfd, "re");
if (!f)
return NULL;
/* Transfer ownership of fd. */
move_fd(dupfd);
#endif
return f; return f;
} }
src/tests/Makefile.am
...@@ -34,12 +34,16 @@ lxc_test_raw_clone_SOURCES = lxc_raw_clone.c \ ...@@ -34,12 +34,16 @@ lxc_test_raw_clone_SOURCES = lxc_raw_clone.c \
../lxc/utils.c ../lxc/utils.h ../lxc/utils.c ../lxc/utils.h
lxc_test_reboot_SOURCES = reboot.c lxc_test_reboot_SOURCES = reboot.c
lxc_test_saveconfig_SOURCES = saveconfig.c lxc_test_saveconfig_SOURCES = saveconfig.c
lxc_test_share_ns_SOURCES = share_ns.c lxctest.h lxc_test_share_ns_SOURCES = share_ns.c \
lxctest.h \
../lxc/compiler.h
lxc_test_shortlived_SOURCES = shortlived.c lxc_test_shortlived_SOURCES = shortlived.c
lxc_test_shutdowntest_SOURCES = shutdowntest.c lxc_test_shutdowntest_SOURCES = shutdowntest.c
lxc_test_snapshot_SOURCES = snapshot.c lxc_test_snapshot_SOURCES = snapshot.c
lxc_test_startone_SOURCES = startone.c lxc_test_startone_SOURCES = startone.c
lxc_test_state_server_SOURCES = state_server.c lxctest.h lxc_test_state_server_SOURCES = state_server.c \
lxctest.h \
../lxc/compiler.h
lxc_test_utils_SOURCES = lxc-test-utils.c lxctest.h lxc_test_utils_SOURCES = lxc-test-utils.c lxctest.h
AM_CFLAGS=-DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \ AM_CFLAGS=-DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
......
src/tests/share_ns.c
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#define _GNU_SOURCE
#include <alloca.h> #include <alloca.h>
#include <errno.h> #include <errno.h>
#include <pthread.h> #include <pthread.h>
...@@ -30,23 +31,26 @@ ...@@ -30,23 +31,26 @@
#include "lxc/lxccontainer.h" #include "lxc/lxccontainer.h"
#include "lxctest.h" #include "lxctest.h"
#include "../lxc/compiler.h"
#define TEST_DEFAULT_BUF_SIZE 256
struct thread_args { struct thread_args {
int thread_id; int thread_id;
bool success; bool success;
pid_t init_pid; pid_t init_pid;
char inherited_ipc_ns[4096]; char inherited_ipc_ns[TEST_DEFAULT_BUF_SIZE];
char inherited_net_ns[4096]; char inherited_net_ns[TEST_DEFAULT_BUF_SIZE];
}; };
void *ns_sharing_wrapper(void *data) __noreturn static void *ns_sharing_wrapper(void *data)
{ {
int init_pid; int init_pid;
ssize_t ret; ssize_t ret;
char name[100]; char name[100];
char owning_ns_init_pid[100]; char owning_ns_init_pid[100];
char proc_ns_path[256]; char proc_ns_path[TEST_DEFAULT_BUF_SIZE];
char ns_buf[256]; char ns_buf[TEST_DEFAULT_BUF_SIZE];
struct lxc_container *c; struct lxc_container *c;
struct thread_args *args = data; struct thread_args *args = data;
...@@ -56,7 +60,7 @@ void *ns_sharing_wrapper(void *data) ...@@ -56,7 +60,7 @@ void *ns_sharing_wrapper(void *data)
c = lxc_container_new(name, NULL); c = lxc_container_new(name, NULL);
if (!c) { if (!c) {
lxc_error("Failed to create container \"%s\"\n", name); lxc_error("Failed to create container \"%s\"\n", name);
return NULL; goto out_pthread_exit;
} }
if (c->is_defined(c)) { if (c->is_defined(c)) {
...@@ -74,6 +78,8 @@ void *ns_sharing_wrapper(void *data) ...@@ -74,6 +78,8 @@ void *ns_sharing_wrapper(void *data)
goto out; goto out;
} }
c->clear_config(c);
if (!c->load_config(c, NULL)) { if (!c->load_config(c, NULL)) {
lxc_error("Failed to load config for container \"%s\"\n", name); lxc_error("Failed to load config for container \"%s\"\n", name);
goto out; goto out;
...@@ -131,7 +137,7 @@ void *ns_sharing_wrapper(void *data) ...@@ -131,7 +137,7 @@ void *ns_sharing_wrapper(void *data)
lxc_error("Failed to retrieve ipc namespace for container \"%s\"\n", name); lxc_error("Failed to retrieve ipc namespace for container \"%s\"\n", name);
goto out; goto out;
} }
ns_buf[ret] = '\0'; ns_buf[ret == 0 ? ret : ret - 1] = '\0';
if (strcmp(args->inherited_ipc_ns, ns_buf) != 0) { if (strcmp(args->inherited_ipc_ns, ns_buf) != 0) {
lxc_error("Failed to inherit ipc namespace from container \"owning-ns\": %s != %s\n", args->inherited_ipc_ns, ns_buf); lxc_error("Failed to inherit ipc namespace from container \"owning-ns\": %s != %s\n", args->inherited_ipc_ns, ns_buf);
...@@ -151,7 +157,7 @@ void *ns_sharing_wrapper(void *data) ...@@ -151,7 +157,7 @@ void *ns_sharing_wrapper(void *data)
lxc_error("Failed to retrieve ipc namespace for container \"%s\"\n", name); lxc_error("Failed to retrieve ipc namespace for container \"%s\"\n", name);
goto out; goto out;
} }
ns_buf[ret] = '\0'; ns_buf[ret == 0 ? ret : ret - 1] = '\0';
if (strcmp(args->inherited_net_ns, ns_buf) != 0) { if (strcmp(args->inherited_net_ns, ns_buf) != 0) {
lxc_error("Failed to inherit net namespace from container \"owning-ns\": %s != %s\n", args->inherited_net_ns, ns_buf); lxc_error("Failed to inherit net namespace from container \"owning-ns\": %s != %s\n", args->inherited_net_ns, ns_buf);
...@@ -168,20 +174,22 @@ out: ...@@ -168,20 +174,22 @@ out:
if (!c->destroy(c)) if (!c->destroy(c))
lxc_error("Failed to destroy container \"%s\"\n", name); lxc_error("Failed to destroy container \"%s\"\n", name);
lxc_container_put(c);
out_pthread_exit:
pthread_exit(NULL); pthread_exit(NULL);
return NULL;
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct thread_args *args = NULL; struct thread_args *args = NULL;
pthread_t *threads = NULL;
size_t nthreads = 10; size_t nthreads = 10;
int i, init_pid, j; int i, init_pid, j;
char proc_ns_path[4096]; char proc_ns_path[TEST_DEFAULT_BUF_SIZE];
char ipc_ns_buf[4096]; char ipc_ns_buf[TEST_DEFAULT_BUF_SIZE];
char net_ns_buf[4096]; char net_ns_buf[TEST_DEFAULT_BUF_SIZE];
pthread_attr_t attr; pthread_attr_t attr;
pthread_t threads[10];
struct lxc_container *c; struct lxc_container *c;
int ret = EXIT_FAILURE; int ret = EXIT_FAILURE;
...@@ -195,17 +203,17 @@ int main(int argc, char *argv[]) ...@@ -195,17 +203,17 @@ int main(int argc, char *argv[])
if (c->is_defined(c)) { if (c->is_defined(c)) {
lxc_error("%s\n", "Container \"owning-ns\" is defined"); lxc_error("%s\n", "Container \"owning-ns\" is defined");
goto on_error_put; goto on_error_stop;
} }
if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) { if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) {
lxc_error("%s\n", "Failed to create busybox container \"owning-ns\""); lxc_error("%s\n", "Failed to create busybox container \"owning-ns\"");
goto on_error_put; goto on_error_stop;
} }
if (!c->is_defined(c)) { if (!c->is_defined(c)) {
lxc_error("%s\n", "Container \"owning-ns\" is not defined"); lxc_error("%s\n", "Container \"owning-ns\" is not defined");
goto on_error_put; goto on_error_stop;
} }
c->clear_config(c); c->clear_config(c);
...@@ -268,15 +276,26 @@ int main(int argc, char *argv[]) ...@@ -268,15 +276,26 @@ int main(int argc, char *argv[])
goto on_error_stop; goto on_error_stop;
} }
threads = malloc(sizeof(pthread_t) * nthreads);
if (!threads) {
lxc_error("%s\n", "Failed to allocate memory");
goto on_error_stop;
}
for (j = 0; j < 10; j++) { for (j = 0; j < 10; j++) {
bool had_error = false;
lxc_debug("Starting namespace sharing test iteration %d\n", j); lxc_debug("Starting namespace sharing test iteration %d\n", j);
for (i = 0; i < nthreads; i++) { for (i = 0; i < nthreads; i++) {
memset(&args[i], 0, sizeof(struct thread_args));
memset(&threads[i], 0, sizeof(pthread_t));
args[i].thread_id = i; args[i].thread_id = i;
args[i].success = false; args[i].success = false;
args[i].init_pid = init_pid; args[i].init_pid = init_pid;
memcpy(args[i].inherited_ipc_ns, ipc_ns_buf, sizeof(args[i].inherited_ipc_ns)); snprintf(args[i].inherited_ipc_ns, sizeof(args[i].inherited_ipc_ns), "%s", ipc_ns_buf);
memcpy(args[i].inherited_net_ns, net_ns_buf, sizeof(args[i].inherited_net_ns)); snprintf(args[i].inherited_net_ns, sizeof(args[i].inherited_net_ns), "%s", net_ns_buf);
ret = pthread_create(&threads[i], &attr, ns_sharing_wrapper, (void *)&args[i]); ret = pthread_create(&threads[i], &attr, ns_sharing_wrapper, (void *)&args[i]);
if (ret != 0) if (ret != 0)
...@@ -290,15 +309,19 @@ int main(int argc, char *argv[]) ...@@ -290,15 +309,19 @@ int main(int argc, char *argv[])
if (!args[i].success) { if (!args[i].success) {
lxc_error("ns sharing thread %d failed\n", args[i].thread_id); lxc_error("ns sharing thread %d failed\n", args[i].thread_id);
goto on_error_stop; had_error = true;
} }
} }
if (had_error)
goto on_error_stop;
} }
ret = EXIT_SUCCESS; ret = EXIT_SUCCESS;
on_error_stop: on_error_stop:
free(args); free(args);
free(threads);
pthread_attr_destroy(&attr); pthread_attr_destroy(&attr);
if (c->is_running(c) && !c->stop(c)) if (c->is_running(c) && !c->stop(c))
...@@ -307,7 +330,6 @@ on_error_stop: ...@@ -307,7 +330,6 @@ on_error_stop:
if (!c->destroy(c)) if (!c->destroy(c))
lxc_error("%s\n", "Failed to destroy container \"owning-ns\""); lxc_error("%s\n", "Failed to destroy container \"owning-ns\"");
on_error_put:
lxc_container_put(c); lxc_container_put(c);
if (ret == EXIT_SUCCESS) if (ret == EXIT_SUCCESS)
lxc_debug("%s\n", "All state namespace sharing tests passed"); lxc_debug("%s\n", "All state namespace sharing tests passed");
......
src/tests/state_server.c
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "lxc/lxccontainer.h" #include "lxc/lxccontainer.h"
#include "lxctest.h" #include "lxctest.h"
#include "../lxc/compiler.h"
struct thread_args { struct thread_args {
int thread_id; int thread_id;
...@@ -38,7 +39,7 @@ struct thread_args { ...@@ -38,7 +39,7 @@ struct thread_args {
struct lxc_container *c; struct lxc_container *c;
}; };
static void *state_wrapper(void *data) __noreturn static void *state_wrapper(void *data)
{ {
struct thread_args *args = data; struct thread_args *args = data;
...@@ -50,7 +51,6 @@ static void *state_wrapper(void *data) ...@@ -50,7 +51,6 @@ static void *state_wrapper(void *data)
args->thread_id, args->timeout, args->success ? "SUCCESS" : "FAILED"); args->thread_id, args->timeout, args->success ? "SUCCESS" : "FAILED");
pthread_exit(NULL); pthread_exit(NULL);
return NULL;
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
......
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