summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-12-24 19:31:44 +0100
committerLennart Poettering <lennart@poettering.net>2013-12-24 19:31:44 +0100
commit751bc6ac79320bc16e63e8c1bbb713c30a3b7bc9 (patch)
tree513508ade203dc372d6aabbfcb8bf5e6cc490dc6 /src/shared
parent4e6a9570b698b335c6f59ec3556dfb3e95817d75 (diff)
bus: properly shift cgroup data returned from kdbus by the container's root before parsing
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/cgroup-util.c52
-rw-r--r--src/shared/cgroup-util.h1
2 files changed, 37 insertions, 16 deletions
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
index 74889b6363..27eee8eacd 100644
--- a/src/shared/cgroup-util.c
+++ b/src/shared/cgroup-util.c
@@ -1082,42 +1082,62 @@ int cg_get_root_path(char **path) {
return 0;
}
-int cg_pid_get_path_shifted(pid_t pid, const char *root, char **cgroup) {
- _cleanup_free_ char *cg_root = NULL;
- char *cg_process, *p;
+int cg_shift_path(const char *cgroup, const char *root, const char **shifted) {
+ _cleanup_free_ char *rt = NULL;
+ char *p;
int r;
- assert(pid >= 0);
assert(cgroup);
+ assert(shifted);
if (!root) {
/* If the root was specified let's use that, otherwise
* let's determine it from PID 1 */
- r = cg_get_root_path(&cg_root);
+ r = cg_get_root_path(&rt);
if (r < 0)
return r;
- root = cg_root;
+ root = rt;
}
- r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, pid, &cg_process);
+ p = path_startswith(cgroup, root);
+ if (p)
+ *shifted = p - 1;
+ else
+ *shifted = cgroup;
+
+ return 0;
+}
+
+int cg_pid_get_path_shifted(pid_t pid, const char *root, char **cgroup) {
+ _cleanup_free_ char *raw = NULL;
+ const char *c;
+ int r;
+
+ assert(pid >= 0);
+ assert(cgroup);
+
+ r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, pid, &raw);
if (r < 0)
return r;
- p = path_startswith(cg_process, root);
- if (p) {
- char *c;
+ r = cg_shift_path(raw, root, &c);
+ if (r < 0)
+ return r;
- c = strdup(p - 1);
- free(cg_process);
+ if (c == raw) {
+ *cgroup = raw;
+ raw = NULL;
+ } else {
+ char *n;
- if (!c)
+ n = strdup(c);
+ if (!n)
return -ENOMEM;
- *cgroup = c;
- } else
- *cgroup = cg_process;
+ *cgroup = n;
+ }
return 0;
}
diff --git a/src/shared/cgroup-util.h b/src/shared/cgroup-util.h
index 3e6a3f6abe..743d902e2d 100644
--- a/src/shared/cgroup-util.h
+++ b/src/shared/cgroup-util.h
@@ -103,6 +103,7 @@ int cg_path_get_user_unit(const char *path, char **unit);
int cg_path_get_machine_name(const char *path, char **machine);
int cg_path_get_slice(const char *path, char **slice);
+int cg_shift_path(const char *cgroup, const char *cached_root, const char **shifted);
int cg_pid_get_path_shifted(pid_t pid, const char *cached_root, char **cgroup);
int cg_pid_get_session(pid_t pid, char **session);