From: Alessandro Puccetti <alessandro@kinvolk.io>
Date: Fri, 22 Jul 2016 13:59:14 +0000 (+0200)
Subject: namespace: ensure to return a valid inaccessible nodes (#3778)
X-Git-Tag: v231~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3d1d51603408e7aea7971fabf41b38c9e12fd69;p=thirdparty%2Fsystemd.git

namespace: ensure to return a valid inaccessible nodes (#3778)

Because /run/systemd/inaccessible/{chr,blk} are devices with
major=0 and minor=0 it might be possible that these devices cannot be created
so we use /run/systemd/inaccessible/sock instead to map them.
---

diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c
index 63dff3dd5cb..b91f0f9e0e0 100644
--- a/src/basic/mount-util.c
+++ b/src/basic/mount-util.c
@@ -534,15 +534,22 @@ int repeat_unmount(const char *path, int flags) {
 }
 
 const char* mode_to_inaccessible_node(mode_t mode) {
+        /* This function maps a node type to the correspondent inaccessible node type.
+         * Character and block inaccessible devices may not be created (because major=0 and minor=0),
+         * in such case we map character and block devices to the inaccessible node type socket. */
         switch(mode & S_IFMT) {
                 case S_IFREG:
                         return "/run/systemd/inaccessible/reg";
                 case S_IFDIR:
                         return "/run/systemd/inaccessible/dir";
                 case S_IFCHR:
-                        return "/run/systemd/inaccessible/chr";
+                        if (access("/run/systemd/inaccessible/chr", F_OK) == 0)
+                                return "/run/systemd/inaccessible/chr";
+                        return "/run/systemd/inaccessible/sock";
                 case S_IFBLK:
-                        return "/run/systemd/inaccessible/blk";
+                        if (access("/run/systemd/inaccessible/blk", F_OK) == 0)
+                                return "/run/systemd/inaccessible/blk";
+                        return "/run/systemd/inaccessible/sock";
                 case S_IFIFO:
                         return "/run/systemd/inaccessible/fifo";
                 case S_IFSOCK: