[systemd-commits] src/shared

[Michal Schmidt]

 src/shared/selinux-util.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 2d58aa4692e9fc47911bff5d064ba3e328c35369
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Thu Nov 6 16:48:11 2014 +0100

    shared: create files even if the SELinux policy has no context for them
    
    The SELinux policy defines no context for some files. E.g.:
      $ matchpathcon /run/lock/subsys /dev/mqueue
      /run/lock/subsys        <<none>>
      /dev/mqueue     <<none>>
    
    We still need to be able to create them.
    In this case selabel_lookup_raw() returns ENOENT. We should then skip
    setfscreatecon(), but still return success.
    It was broken since c34255bdb2 ("label: unify code to make directories,
    symlinks").

diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c
index 1eddd17..6bd3bf1 100644
--- a/src/shared/selinux-util.c
+++ b/src/shared/selinux-util.c
@@ -332,9 +332,13 @@ int mac_selinux_create_file_prepare(const char *path, mode_t mode) {
                 r = selabel_lookup_raw(label_hnd, &filecon, newpath, mode);
         }
 
-        if (r < 0 && errno != ENOENT)
+        /* No context specified by the policy? Proceed without setting it. */
+        if (r < 0 && errno == ENOENT)
+                return 0;
+
+        if (r < 0)
                 r = -errno;
-        else if (r == 0) {
+        else {
                 r = setfscreatecon(filecon);
                 if (r < 0) {
                         log_enforcing("Failed to set SELinux security context %s for %s: %m", filecon, path);