mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-08-31 19:39:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1262 from brauner/2016-10-29/lxc_free_cgroup_sigsegv

Browse Source 
cgfs: various fixes
This commit is contained in:
Serge Hallyn
2016-11-07 10:09:06 -07:00
committed by GitHub
parent f5795427b1 517587ef58
commit f79750ace9
1 changed files with 72 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/lxc/cgroups/cgfs.c
View File

@@ -364,6 +364,14 @@ static bool find_cgroup_hierarchies(struct cgroup_meta_data *meta_data,
*colon2 = '\0';
colon2 = NULL;
/* With cgroupv2 /proc/self/cgroup can contain entries of the
* form: 0::/
* These entries need to be skipped.
*/
if (!strcmp(colon1, ""))
continue;
hierarchy_number = strtoul(line, &colon2, 10);
if (!colon2 || *colon2)
continue;
@@ -504,7 +512,7 @@ static bool find_hierarchy_mountpts( struct cgroup_meta_data *meta_data, char **
goto out;
h = NULL;
for (k = 1; k <= meta_data->maximum_hierarchy; k++) {
for (k = 0; k <= meta_data->maximum_hierarchy; k++) {
if (meta_data->hierarchies[k] &&
meta_data->hierarchies[k]->subsystems[0] &&
lxc_string_in_array(meta_data->hierarchies[k]->subsystems[0], (const char **)subsystems)) {
@@ -646,6 +654,8 @@ static struct cgroup_hierarchy *lxc_cgroup_find_hierarchy(struct cgroup_meta_dat
size_t i;
for (i = 0; i <= meta_data->maximum_hierarchy; i++) {
struct cgroup_hierarchy *h = meta_data->hierarchies[i];
if (!h)
continue;
if (h && lxc_string_in_array(subsystem, (const char **)h->subsystems))
return h;
}
@@ -884,6 +894,8 @@ static struct cgroup_process_info *lxc_cgroupfs_create(const char *name, const c
/* find mount points we can use */
for (info_ptr = base_info; info_ptr; info_ptr = info_ptr->next) {
h = info_ptr->hierarchy;
if (!h)
continue;
mp = lxc_cgroup_find_mount_point(h, info_ptr->cgroup_path, true);
if (!mp) {
ERROR("Could not find writable mount point for cgroup hierarchy %d while trying to create cgroup.", h->index);
@@ -973,6 +985,9 @@ static struct cgroup_process_info *lxc_cgroupfs_create(const char *name, const c
for (i = 0, info_ptr = base_info; info_ptr; info_ptr = info_ptr->next, i++) {
char *parts2[3];
if (!info_ptr->hierarchy)
continue;
if (lxc_string_in_array("ns", (const char **)info_ptr->hierarchy->subsystems))
continue;
current_entire_path = NULL;
@@ -1071,6 +1086,8 @@ skip:
/* we're done, now update the paths */
for (i = 0, info_ptr = base_info; info_ptr; info_ptr = info_ptr->next, i++) {
if (!info_ptr->hierarchy)
continue;
/* ignore legacy 'ns' subsystem here, lxc_cgroup_create_legacy
* will take care of it
* Since we do a continue in above loop, new_cgroup_paths[i] is
@@ -1108,6 +1125,9 @@ static int lxc_cgroup_create_legacy(struct cgroup_process_info *base_info, const
int r;
for (info_ptr = base_info; info_ptr; info_ptr = info_ptr->next) {
if (!info_ptr->hierarchy)
continue;
if (!lxc_string_in_array("ns", (const char **)info_ptr->hierarchy->subsystems))
continue;
/*
@@ -1192,6 +1212,9 @@ static int lxc_cgroupfs_enter(struct cgroup_process_info *info, pid_t pid, bool
snprintf(pid_buf, 32, "%lu", (unsigned long)pid);
for (info_ptr = info; info_ptr; info_ptr = info_ptr->next) {
if (!info_ptr->hierarchy)
continue;
char *cgroup_path = (enter_sub && info_ptr->cgroup_path_sub) ?
info_ptr->cgroup_path_sub :
info_ptr->cgroup_path;
@@ -1436,6 +1459,10 @@ static bool cgroupfs_mount_cgroup(void *hdata, const char *root, int type)
for (info = base_info; info; info = info->next) {
size_t subsystem_count, i;
struct cgroup_mount_point *mp = info->designated_mount_point;
if (!info->hierarchy)
continue;
if (!mountpoint_is_accessible(mp))
mp = lxc_cgroup_find_mount_point(info->hierarchy, info->cgroup_path, true);
@@ -1685,6 +1712,14 @@ lxc_cgroup_process_info_getx(const char *proc_pid_cgroup_str,
*colon2++ = '\0';
endptr = NULL;
/* With cgroupv2 /proc/self/cgroup can contain entries of the
* form: 0::/
* These entries need to be skipped.
*/
if (!strcmp(colon1, ""))
continue;
hierarchy_number = strtoul(line, &endptr, 10);
if (!endptr || *endptr)
continue;
@@ -1914,6 +1949,8 @@ find_info_for_subsystem(struct cgroup_process_info *info, const char *subsystem)
struct cgroup_process_info *info_ptr;
for (info_ptr = info; info_ptr; info_ptr = info_ptr->next) {
struct cgroup_hierarchy *h = info_ptr->hierarchy;
if (!h)
continue;
if (lxc_string_in_array(subsystem, (const char **)h->subsystems))
return info_ptr;
}
@@ -2270,6 +2307,33 @@ static bool init_cpuset_if_needed(struct cgroup_mount_point *mp,
do_init_cpuset_file(mp, path, "/cpuset.mems") );
}
static void print_cgfs_init_debuginfo(struct cgfs_data *d)
{
int i;
if (!getenv("LXC_DEBUG_CGFS"))
return;
DEBUG("Cgroup information:");
DEBUG(" container name: %s", d->name);
if (!d->meta || !d->meta->hierarchies) {
DEBUG(" No hierarchies found.");
return;
}
DEBUG(" Controllers:");
for (i = 0; i <= d->meta->maximum_hierarchy; i++) {
char **p;
struct cgroup_hierarchy *h = d->meta->hierarchies[i];
if (!h) {
DEBUG(" Empty hierarchy number %d.", i);
continue;
}
for (p = h->subsystems; p && *p; p++) {
DEBUG(" %2d: %s", i, *p);
}
}
}
struct cgroup_ops *cgfs_ops_init(void)
{
return &cgfs_ops;
@@ -2295,6 +2359,9 @@ static void *cgfs_init(const char *name)
ERROR("cgroupfs failed to detect cgroup metadata");
goto err2;
}
print_cgfs_init_debuginfo(d);
return d;
err2:
@@ -2380,7 +2447,7 @@ static bool cgfs_escape(void *hdata)
if (!md)
return false;
for (i = 1; i <= md->maximum_hierarchy; i++) {
for (i = 0; i <= md->maximum_hierarchy; i++) {
struct cgroup_hierarchy *h = md->hierarchies[i];
struct cgroup_mount_point *mp;
char *tasks;
@@ -2590,6 +2657,9 @@ static bool cgfs_chown(void *hdata, struct lxc_conf *conf)
return false;
for (info_ptr = d->info; info_ptr; info_ptr = info_ptr->next) {
if (!info_ptr->hierarchy)
continue;
if (!info_ptr->designated_mount_point) {
info_ptr->designated_mount_point = lxc_cgroup_find_mount_point(info_ptr->hierarchy, info_ptr->cgroup_path, true);
if (!info_ptr->designated_mount_point) {