core: do not read system boot timestamps in systemd --user mode

[elogind.git] / src / core / cgroup.c

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 50de02d0ce041a52ade7ca9cc64706c74007a59e..3dd4c9129c052d0b271eee6a2183e7656ff4ded7 100644 (file)
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -20,6 +20,7 @@
 ***/
 
 #include <fcntl.h>
+#include <fnmatch.h>
 
 #include "path-util.h"
 #include "special.h"
@@ -246,7 +247,8 @@ static int whitelist_major(const char *path, const char *name, char type, const
 
                 w++;
                 w += strspn(w, WHITESPACE);
-                if (!streq(w, name))
+
+                if (fnmatch(name, w, 0) != 0)
                         continue;
 
                 sprintf(buf,
@@ -268,6 +270,7 @@ fail:
 }
 
 void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const char *path) {
+        bool is_root;
         int r;
 
         assert(c);
@@ -276,7 +279,11 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha
         if (mask == 0)
                 return;
 
-        if (mask & CGROUP_CPU) {
+        /* Some cgroup attributes are not support on the root cgroup,
+         * hence silently ignore */
+        is_root = isempty(path) || path_equal(path, "/");
+
+        if ((mask & CGROUP_CPU) && !is_root) {
                 char buf[DECIMAL_STR_MAX(unsigned long) + 1];
 
                 sprintf(buf, "%lu\n", c->cpu_shares);
@@ -292,23 +299,25 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha
                 CGroupBlockIODeviceWeight *w;
                 CGroupBlockIODeviceBandwidth *b;
 
-                sprintf(buf, "%lu\n", c->blockio_weight);
-                r = cg_set_attribute("blkio", path, "blkio.weight", buf);
-                if (r < 0)
-                        log_warning("Failed to set blkio.weight on %s: %s", path, strerror(-r));
+                if (!is_root) {
+                        sprintf(buf, "%lu\n", c->blockio_weight);
+                        r = cg_set_attribute("blkio", path, "blkio.weight", buf);
+                        if (r < 0)
+                                log_warning("Failed to set blkio.weight on %s: %s", path, strerror(-r));
 
-                /* FIXME: no way to reset this list */
-                LIST_FOREACH(device_weights, w, c->blockio_device_weights) {
-                        dev_t dev;
+                        /* FIXME: no way to reset this list */
+                        LIST_FOREACH(device_weights, w, c->blockio_device_weights) {
+                                dev_t dev;
 
-                        r = lookup_blkio_device(w->path, &dev);
-                        if (r < 0)
-                                continue;
+                                r = lookup_blkio_device(w->path, &dev);
+                                if (r < 0)
+                                        continue;
 
-                        sprintf(buf, "%u:%u %lu", major(dev), minor(dev), w->weight);
-                        r = cg_set_attribute("blkio", path, "blkio.weight_device", buf);
-                        if (r < 0)
-                                log_error("Failed to set blkio.weight_device on %s: %s", path, strerror(-r));
+                                sprintf(buf, "%u:%u %lu", major(dev), minor(dev), w->weight);
+                                r = cg_set_attribute("blkio", path, "blkio.weight_device", buf);
+                                if (r < 0)
+                                        log_error("Failed to set blkio.weight_device on %s: %s", path, strerror(-r));
+                        }
                 }
 
                 /* FIXME: no way to reset this list */
@@ -342,7 +351,7 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha
                         log_error("Failed to set memory.limit_in_bytes on %s: %s", path, strerror(-r));
         }
 
-        if (mask & CGROUP_DEVICE) {
+        if ((mask & CGROUP_DEVICE) && !is_root) {
                 CGroupDeviceAllow *a;
 
                 if (c->device_allow || c->device_policy != CGROUP_AUTO)
@@ -350,21 +359,27 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha
                 else
                         r = cg_set_attribute("devices", path, "devices.allow", "a");
                 if (r < 0)
-                        log_error("Failed to reset devices.list on %s: %s", path, strerror(-r));
+                        log_warning("Failed to reset devices.list on %s: %s", path, strerror(-r));
 
                 if (c->device_policy == CGROUP_CLOSED ||
                     (c->device_policy == CGROUP_AUTO && c->device_allow)) {
                         static const char auto_devices[] =
-                                "/dev/null\0" "rw\0"
-                                "/dev/zero\0" "rw\0"
-                                "/dev/full\0" "rw\0"
-                                "/dev/random\0" "rw\0"
-                                "/dev/urandom\0" "rw\0";
+                                "/dev/null\0" "rwm\0"
+                                "/dev/zero\0" "rwm\0"
+                                "/dev/full\0" "rwm\0"
+                                "/dev/random\0" "rwm\0"
+                                "/dev/urandom\0" "rwm\0"
+                                "/dev/tty\0" "rwm\0"
+                                "/dev/pts/ptmx\0" "rw\0"; /* /dev/pts/ptmx may not be duplicated, but accessed */
 
                         const char *x, *y;
 
                         NULSTR_FOREACH_PAIR(x, y, auto_devices)
                                 whitelist_device(path, x, y);
+
+                        whitelist_major(path, "pts", 'c', "rw");
+                        whitelist_major(path, "kdbus", 'c', "rw");
+                        whitelist_major(path, "kdbus/*", 'c', "rw");
                 }
 
                 LIST_FOREACH(device_allow, a, c->device_allow) {
@@ -853,8 +868,7 @@ int manager_setup_cgroup(Manager *m) {
         }
 
         /* 5. And pin it, so that it cannot be unmounted */
-        if (m->pin_cgroupfs_fd >= 0)
-                close_nointr_nofail(m->pin_cgroupfs_fd);
+        safe_close(m->pin_cgroupfs_fd);
 
         m->pin_cgroupfs_fd = open(path, O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOCTTY|O_NONBLOCK);
         if (r < 0) {
@@ -879,10 +893,7 @@ void manager_shutdown_cgroup(Manager *m, bool delete) {
         if (delete && m->cgroup_root)
                 cg_trim(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, false);
 
-        if (m->pin_cgroupfs_fd >= 0) {
-                close_nointr_nofail(m->pin_cgroupfs_fd);
-                m->pin_cgroupfs_fd = -1;
-        }
+        m->pin_cgroupfs_fd = safe_close(m->pin_cgroupfs_fd);
 
         free(m->cgroup_root);
         m->cgroup_root = NULL;