summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-05-03 21:23:38 (GMT)
committerLennart Poettering <lennart@poettering.net>2012-05-03 21:23:38 (GMT)
commit37099707e26ef2c6d215f6e7f17dd46bf6aad586 (patch)
tree0816bb29e8f11fa328fca87d2ace102f601a5f98
parent6e476bc9d18c706564d797882df6a27ab2d45b8b (diff)
cgroup: fix alloca() misuse in cg_shorten_controllers()
-rw-r--r--TODO2
-rw-r--r--src/shared/cgroup-util.c33
2 files changed, 24 insertions, 11 deletions
diff --git a/TODO b/TODO
index 2e33360..f2c5dd6 100644
--- a/TODO
+++ b/TODO
@@ -60,8 +60,6 @@ Features:
* add RequiredBy to [Install]
-* cg_shorten_controllers() misuses alloca()
-
* udev: move to LGPL
* udev systemd unify:
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
index d34c142..1f310d3 100644
--- a/src/shared/cgroup-util.c
+++ b/src/shared/cgroup-util.c
@@ -565,9 +565,23 @@ int cg_get_path(const char *controller, const char *path, const char *suffix, ch
return join_path(p, path, suffix, fs);
}
+static int check(const char *p) {
+ char *cc;
+
+ assert(p);
+
+ /* Check if this controller actually really exists */
+ cc = alloca(sizeof("/sys/fs/cgroup/") + strlen(p));
+ strcpy(stpcpy(cc, "/sys/fs/cgroup/"), p);
+ if (access(cc, F_OK) < 0)
+ return -errno;
+
+ return 0;
+}
+
int cg_get_path_and_check(const char *controller, const char *path, const char *suffix, char **fs) {
const char *p;
- char *cc;
+ int r;
assert(controller);
assert(fs);
@@ -575,13 +589,13 @@ int cg_get_path_and_check(const char *controller, const char *path, const char *
if (isempty(controller))
return -EINVAL;
+ /* Normalize the controller syntax */
p = normalize_controller(controller);
/* Check if this controller actually really exists */
- cc = alloca(sizeof("/sys/fs/cgroup/") + strlen(p));
- strcpy(stpcpy(cc, "/sys/fs/cgroup/"), p);
- if (access(cc, F_OK) < 0)
- return -errno;
+ r = check(p);
+ if (r < 0)
+ return r;
return join_path(p, path, suffix, fs);
}
@@ -1111,17 +1125,18 @@ char **cg_shorten_controllers(char **controllers) {
return controllers;
for (f = controllers, t = controllers; *f; f++) {
- char *cc;
+ int r;
+ const char *p;
if (streq(*f, "systemd") || streq(*f, SYSTEMD_CGROUP_CONTROLLER)) {
free(*f);
continue;
}
- cc = alloca(sizeof("/sys/fs/cgroup/") + strlen(*f));
- strcpy(stpcpy(cc, "/sys/fs/cgroup/"), *f);
+ p = normalize_controller(*f);
- if (access(cc, F_OK) < 0) {
+ r = check(p);
+ if (r < 0) {
log_debug("Controller %s is not available, removing from controllers list.", *f);
free(*f);
continue;