X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fnamespace.c;h=4b8dbdd0d83d975a2e5f135d280d05f056047f98;hp=c2215090a9dfa2bea6d7ecc572d1e22d362b2dac;hb=615938651d3a4fd9253b08da00db22d451a8cef8;hpb=d267c5aa3d0fe4960165a1e1c00a840eef8b7d00

diff --git a/src/core/namespace.c b/src/core/namespace.c
index c2215090a..4b8dbdd0d 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -35,7 +35,6 @@
 #include "strv.h"
 #include "util.h"
 #include "path-util.h"
-#include "namespace.h"
 #include "missing.h"
 #include "execute.h"
 #include "loopback-setup.h"
@@ -43,6 +42,8 @@
 #include "dev-setup.h"
 #include "def.h"
 #include "label.h"
+#include "selinux-util.h"
+#include "namespace.h"
 
 typedef enum MountMode {
         /* This is ordered by priority! */
@@ -145,7 +146,7 @@ static int mount_dev(BindMount *m) {
                 "/dev/tty\0";
 
         char temporary_mount[] = "/tmp/namespace-dev-XXXXXX";
-        const char *d, *dev = NULL, *devpts = NULL, *devshm = NULL, *devkdbus = NULL, *devhugepages = NULL, *devmqueue = NULL, *devlog = NULL, *devptmx = NULL;
+        const char *d, *dev = NULL, *devpts = NULL, *devshm = NULL, *devhugepages = NULL, *devmqueue = NULL, *devlog = NULL, *devptmx = NULL;
         _cleanup_umask_ mode_t u;
         int r;
 
@@ -157,14 +158,14 @@ static int mount_dev(BindMount *m) {
                 return -errno;
 
         dev = strappenda(temporary_mount, "/dev");
-        mkdir(dev, 0755);
+        (void)mkdir(dev, 0755);
         if (mount("tmpfs", dev, "tmpfs", MS_NOSUID|MS_STRICTATIME, "mode=755") < 0) {
                 r = -errno;
                 goto fail;
         }
 
         devpts = strappenda(temporary_mount, "/dev/pts");
-        mkdir(devpts, 0755);
+        (void)mkdir(devpts, 0755);
         if (mount("/dev/pts", devpts, NULL, MS_BIND, NULL) < 0) {
                 r = -errno;
                 goto fail;
@@ -174,7 +175,7 @@ static int mount_dev(BindMount *m) {
         symlink("pts/ptmx", devptmx);
 
         devshm = strappenda(temporary_mount, "/dev/shm");
-        mkdir(devshm, 01777);
+        (void)mkdir(devshm, 01777);
         r = mount("/dev/shm", devshm, NULL, MS_BIND, NULL);
         if (r < 0) {
                 r = -errno;
@@ -182,15 +183,11 @@ static int mount_dev(BindMount *m) {
         }
 
         devmqueue = strappenda(temporary_mount, "/dev/mqueue");
-        mkdir(devmqueue, 0755);
+        (void)mkdir(devmqueue, 0755);
         mount("/dev/mqueue", devmqueue, NULL, MS_BIND, NULL);
 
-        devkdbus = strappenda(temporary_mount, "/dev/kdbus");
-        mkdir(devkdbus, 0755);
-        mount("/dev/kdbus", devkdbus, NULL, MS_BIND, NULL);
-
         devhugepages = strappenda(temporary_mount, "/dev/hugepages");
-        mkdir(devhugepages, 0755);
+        (void)mkdir(devhugepages, 0755);
         mount("/dev/hugepages", devhugepages, NULL, MS_BIND, NULL);
 
         devlog = strappenda(temporary_mount, "/dev/log");
@@ -225,9 +222,9 @@ static int mount_dev(BindMount *m) {
                         goto fail;
                 }
 
-                label_context_set(d, st.st_mode);
+                mac_selinux_create_file_prepare(d, st.st_mode);
                 r = mknod(dn, st.st_mode, st.st_rdev);
-                label_context_clear();
+                mac_selinux_create_file_clear();
 
                 if (r < 0) {
                         r = -errno;
@@ -254,9 +251,6 @@ fail:
         if (devshm)
                 umount(devshm);
 
-        if (devkdbus)
-                umount(devkdbus);
-
         if (devhugepages)
                 umount(devhugepages);
 
@@ -283,13 +277,11 @@ static int mount_kdbus(BindMount *m) {
 
         u = umask(0000);
 
-        if (!mkdtemp(temporary_mount)) {
-                log_error("Failed create temp dir: %m");
-                return -errno;
-        }
+        if (!mkdtemp(temporary_mount))
+                return log_error_errno(errno, "Failed create temp dir: %m");
 
         root = strappenda(temporary_mount, "/kdbus");
-        mkdir(root, 0755);
+        (void)mkdir(root, 0755);
         if (mount("tmpfs", root, "tmpfs", MS_NOSUID|MS_STRICTATIME, "mode=777") < 0) {
                 r = -errno;
                 goto fail;
@@ -298,21 +290,21 @@ static int mount_kdbus(BindMount *m) {
         /* create a new /dev/null dev node copy so we have some fodder to
          * bind-mount the custom endpoint over. */
         if (stat("/dev/null", &st) < 0) {
-                log_error("Failed to stat /dev/null: %m");
+                log_error_errno(errno, "Failed to stat /dev/null: %m");
                 r = -errno;
                 goto fail;
         }
 
         busnode = strappenda(root, "/bus");
         if (mknod(busnode, (st.st_mode & ~07777) | 0600, st.st_rdev) < 0) {
-                log_error("mknod() for %s failed: %m", busnode);
+                log_error_errno(errno, "mknod() for %s failed: %m", busnode);
                 r = -errno;
                 goto fail;
         }
 
         r = mount(m->path, busnode, "bind", MS_BIND, NULL);
         if (r < 0) {
-                log_error("bind mount of %s failed: %m", m->path);
+                log_error_errno(errno, "bind mount of %s failed: %m", m->path);
                 r = -errno;
                 goto fail;
         }
@@ -324,7 +316,7 @@ static int mount_kdbus(BindMount *m) {
         }
 
         if (mount(root, basepath, NULL, MS_MOVE, NULL) < 0) {
-                log_error("bind mount of %s failed: %m", basepath);
+                log_error_errno(errno, "bind mount of %s failed: %m", basepath);
                 r = -errno;
                 goto fail;
         }
@@ -424,13 +416,13 @@ int setup_namespace(
                 char** read_write_dirs,
                 char** read_only_dirs,
                 char** inaccessible_dirs,
-                char* tmp_dir,
-                char* var_tmp_dir,
-                char* bus_endpoint_path,
+                const char* tmp_dir,
+                const char* var_tmp_dir,
+                const char* bus_endpoint_path,
                 bool private_dev,
                 ProtectHome protect_home,
                 ProtectSystem protect_system,
-                unsigned mount_flags) {
+                unsigned long mount_flags) {
 
         BindMount *m, *mounts = NULL;
         unsigned n;