From: Christian Seiler <christian@iwakd.de>
Date: Sun, 18 Aug 2013 22:52:40 +0000 (+0200)
Subject: cgroup: minor bugfixes so start and attach work again
X-Git-Tag: lxc-1.0.0.alpha1~1^2~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f17323e79969a98604bc30a8cc24cf083d474c3;p=thirdparty%2Flxc.git

cgroup: minor bugfixes so start and attach work again

This fixes some minor bugs in the cgroup logic that made start and
attach fail (at least when all cgroup controllers were mounted
together).

Signed-off-by: Christian Seiler <christian@iwakd.de>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/cgroup.c b/src/lxc/cgroup.c
index 0d2b81ca6..12787a332 100644
--- a/src/lxc/cgroup.c
+++ b/src/lxc/cgroup.c
@@ -561,6 +561,26 @@ static int in_subsys_list(const char *s, const char *list)
 	return 0;
 }
 
+static int subsys_lists_match(const char *list1, const char *list2)
+{
+	char *token, *str, *saveptr = NULL;
+
+	if (!list1 || !list2)
+		return 0;
+
+        if (strlen(list1) != strlen(list2))
+                return 0;
+
+	str = alloca(strlen(list1)+1);
+	strcpy(str, list1);
+	for (; (token = strtok_r(str, ",", &saveptr)); str = NULL) {
+		if (in_subsys_list(token, list2) == 0)
+			return 0;
+	}
+
+	return 1;
+}
+
 static void set_clone_children(struct mntent *m)
 {
 	char path[MAXPATHLEN];
@@ -626,6 +646,7 @@ static char *record_visited(char *opts, char *all_subsystems)
 		else
 			*visited = '\0';
 		strcat(visited, token);
+		oldlen += toklen + (oldlen ? 1 : 0);
 	}
 
 	return visited;
@@ -774,9 +795,12 @@ static bool find_real_cgroup(struct cgroup_desc *d, char *path)
 		if (!(p2 = index(++p, ':')))
 			continue;
 		*p2 = '\0';
+		// remove trailing newlines
+		if (*(p2 + 1) && p2[strlen(p2 + 1)] == '\n')
+		        p2[strlen(p2 + 1)] = '\0';
 		// in case of multiple mounts it may be more correct to
 		// insist all subsystems be the same
-		if (in_subsys_list(p, d->subsystems))
+		if (subsys_lists_match(p, d->subsystems))
 			goto found;
        }
 
@@ -1134,7 +1158,7 @@ void lxc_cgroup_destroy_desc(struct cgroup_desc *cgroups)
 int lxc_cgroup_attach(pid_t pid, const char *name, const char *lxcpath)
 {
 	FILE *f;
-	char *line = NULL, ret = -1;
+	char *line = NULL, ret = 0;
 	size_t len = 0;
 	int first = 1;
 	char *dirpath;
@@ -1162,8 +1186,9 @@ int lxc_cgroup_attach(pid_t pid, const char *name, const char *lxcpath)
 			continue;
 
 		INFO("joining pid %d to cgroup %s", pid, dirpath);
-		if (lxc_cgroup_enter_one(dirpath, pid)) {
+		if (!lxc_cgroup_enter_one(dirpath, pid)) {
 			ERROR("Failed joining %d to %s\n", pid, dirpath);
+			ret = -1;
 			continue;
 		}
 	}
diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index f1f9fcc71..a7981ba60 100644
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -393,12 +393,13 @@ static int lxc_cmd_get_cgroup_callback(int fd, struct lxc_cmd_req *req,
 
 	if (req->datalen < 1)
 		return -1;
-
+        
 	path = cgroup_get_subsys_path(handler, req->data);
 	if (!path)
 		return -1;
 	rsp.datalen = strlen(path) + 1,
 	rsp.data = path;
+	rsp.ret = 0;
 
 	return lxc_cmd_rsp_send(fd, &rsp);
 }