X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fnamespace.c;h=718da2384dc21adc294384d26941b7ec7d11713b;hb=340a1d2330ddc1dd18ad75bcdddf32f63c84b4a1;hp=a2025459f1447823ed0fe3f43208e9720d345280;hpb=b77acbcf7d9070ac01333a1b98c6222bee599550;p=elogind.git diff --git a/src/core/namespace.c b/src/core/namespace.c index a2025459f..718da2384 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -25,24 +25,17 @@ #include #include #include -#include #include -#include -#include #include -#include #include "strv.h" #include "util.h" #include "path-util.h" -#include "namespace.h" #include "missing.h" -#include "execute.h" #include "loopback-setup.h" -#include "mkdir.h" #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! */ @@ -90,9 +83,11 @@ static int append_mounts(BindMount **p, char **strv, MountMode mode) { static int mount_path_compare(const void *a, const void *b) { const BindMount *p = a, *q = b; + int d; - if (path_equal(p->path, q->path)) { + d = path_compare(p->path, q->path); + if (!d) { /* If the paths are equal, check the mode */ if (p->mode < q->mode) return -1; @@ -104,13 +99,7 @@ static int mount_path_compare(const void *a, const void *b) { } /* If the paths are not equal, then order prefixes first */ - if (path_startswith(p->path, q->path)) - return 1; - - if (path_startswith(q->path, p->path)) - return -1; - - return 0; + return d; } static void drop_duplicates(BindMount *m, unsigned *n) { @@ -156,41 +145,44 @@ static int mount_dev(BindMount *m) { if (!mkdtemp(temporary_mount)) return -errno; - dev = strappenda(temporary_mount, "/dev"); - (void)mkdir(dev, 0755); + dev = strjoina(temporary_mount, "/dev"); + (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"); - (void)mkdir(devpts, 0755); + devpts = strjoina(temporary_mount, "/dev/pts"); + (void) mkdir(devpts, 0755); if (mount("/dev/pts", devpts, NULL, MS_BIND, NULL) < 0) { r = -errno; goto fail; } - devptmx = strappenda(temporary_mount, "/dev/ptmx"); - symlink("pts/ptmx", devptmx); + devptmx = strjoina(temporary_mount, "/dev/ptmx"); + if (symlink("pts/ptmx", devptmx) < 0) { + r = -errno; + goto fail; + } - devshm = strappenda(temporary_mount, "/dev/shm"); - (void)mkdir(devshm, 01777); + devshm = strjoina(temporary_mount, "/dev/shm"); + (void) mkdir(devshm, 01777); r = mount("/dev/shm", devshm, NULL, MS_BIND, NULL); if (r < 0) { r = -errno; goto fail; } - devmqueue = strappenda(temporary_mount, "/dev/mqueue"); - (void)mkdir(devmqueue, 0755); - mount("/dev/mqueue", devmqueue, NULL, MS_BIND, NULL); + devmqueue = strjoina(temporary_mount, "/dev/mqueue"); + (void) mkdir(devmqueue, 0755); + (void) mount("/dev/mqueue", devmqueue, NULL, MS_BIND, NULL); - devhugepages = strappenda(temporary_mount, "/dev/hugepages"); - (void)mkdir(devhugepages, 0755); - mount("/dev/hugepages", devhugepages, NULL, MS_BIND, NULL); + devhugepages = strjoina(temporary_mount, "/dev/hugepages"); + (void) mkdir(devhugepages, 0755); + (void) mount("/dev/hugepages", devhugepages, NULL, MS_BIND, NULL); - devlog = strappenda(temporary_mount, "/dev/log"); - symlink("/run/systemd/journal/dev-log", devlog); + devlog = strjoina(temporary_mount, "/dev/log"); + (void) symlink("/run/systemd/journal/dev-log", devlog); NULSTR_FOREACH(d, devnodes) { _cleanup_free_ char *dn = NULL; @@ -276,13 +268,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"); - (void)mkdir(root, 0755); + root = strjoina(temporary_mount, "/kdbus"); + (void) mkdir(root, 0755); if (mount("tmpfs", root, "tmpfs", MS_NOSUID|MS_STRICTATIME, "mode=777") < 0) { r = -errno; goto fail; @@ -291,21 +281,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"); + busnode = strjoina(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); + r = mount(m->path, busnode, NULL, 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; } @@ -317,7 +307,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; } @@ -423,7 +413,7 @@ int setup_namespace( bool private_dev, ProtectHome protect_home, ProtectSystem protect_system, - unsigned mount_flags) { + unsigned long mount_flags) { BindMount *m, *mounts = NULL; unsigned n; @@ -533,7 +523,7 @@ fail: if (n > 0) { for (m = mounts; m < mounts + n; ++m) if (m->done) - umount2(m->path, MNT_DETACH); + (void) umount2(m->path, MNT_DETACH); } return r; @@ -567,7 +557,7 @@ static int setup_one_tmp_dir(const char *id, const char *prefix, char **path) { RUN_WITH_UMASK(0000) { char *y; - y = strappenda(x, "/tmp"); + y = strjoina(x, "/tmp"); if (mkdir(y, 0777 | S_ISVTX) < 0) return -errno; @@ -595,7 +585,7 @@ int setup_tmp_dirs(const char *id, char **tmp_dir, char **var_tmp_dir) { if (r < 0) { char *t; - t = strappenda(a, "/tmp"); + t = strjoina(a, "/tmp"); rmdir(t); rmdir(a);