From: Jan Safranek <jsafrane@redhat.com>
Date: Tue, 22 Dec 2009 08:16:48 +0000 (+0100)
Subject: Fix reading of empty parameter values
X-Git-Tag: v0.35~8^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=902795e9a894bd6d5836c0e473bdafe5669a7dc1;p=thirdparty%2Flibcgroup.git

Fix reading of empty parameter values

When a group parameter has empty value (like uninitialized cpuset.cpus),
libcgroup does not return this parameter value - it returns
ECGROUPVALUENOTEXIST instead.

I think reading whole parameter file instead of just '%s' is the right thing
to do - it helps also with multiline values, like cpuacct.stat.

Signed-off-by: Jan Safranek <jsafrane@redhat.com>
---

diff --git a/src/api.c b/src/api.c
index 8cb3dcc6..863df33e 100644
--- a/src/api.c
+++ b/src/api.c
@@ -1775,7 +1775,7 @@ static int cg_rd_ctrl_file(char *subsys, char *cgroup, char *file, char **value)
 	if (!ctrl_file)
 		return ECGROUPVALUENOTEXIST;
 
-	*value = malloc(CG_VALUE_MAX);
+	*value = calloc(CG_VALUE_MAX, 1);
 	if (!*value) {
 		last_errno = errno;
 		return ECGOTHER;
@@ -1785,10 +1785,14 @@ static int cg_rd_ctrl_file(char *subsys, char *cgroup, char *file, char **value)
 	 * using %as crashes when we try to read from files like
 	 * memory.stat
 	 */
-	ret = fscanf(ctrl_file, "%s", *value);
-	if (ret == 0 || ret == EOF) {
+	ret = fread(*value, 1, CG_VALUE_MAX-1, ctrl_file);
+	if (ret < 0) {
 		free(*value);
 		*value = NULL;
+	} else {
+		/* remove trailing \n */
+		if (ret > 0 && (*value)[ret-1] == '\n')
+			(*value)[ret-1] = '\0';
 	}
 
 	fclose(ctrl_file);