X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Flabel.c;h=70e5c85a11273833837b30fc7faea6fffa752d73;hb=981e4cd325410384cdadd837f34c002699d2d750;hp=92f10f9f90fb939b63b379ee5160d76650d213b5;hpb=708e25e137f8938791b72194a3d56c3476793175;p=elogind.git

diff --git a/src/shared/label.c b/src/shared/label.c
index 92f10f9f9..70e5c85a1 100644
--- a/src/shared/label.c
+++ b/src/shared/label.c
@@ -27,21 +27,66 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#ifdef HAVE_XATTR
+#include <sys/xattr.h>
+#endif
+#ifdef HAVE_SELINUX
+#include <selinux/selinux.h>
+#include <selinux/label.h>
+#endif
 
 #include "label.h"
 #include "strv.h"
 #include "util.h"
 #include "path-util.h"
-
-#ifdef HAVE_SELINUX
 #include "selinux-util.h"
-#include <selinux/selinux.h>
-#include <selinux/label.h>
+#include "smack-util.h"
 
+#ifdef HAVE_SELINUX
 static struct selabel_handle *label_hnd = NULL;
+#endif
+
+static int smack_relabel_in_dev(const char *path) {
+        int r = 0;
+
+#ifdef HAVE_SMACK
+        struct stat sb;
+        const char *label;
+
+        /*
+         * Path must be in /dev and must exist
+         */
+        if (!path_startswith(path, "/dev"))
+                return 0;
+
+        r = lstat(path, &sb);
+        if (r < 0)
+                return -errno;
+
+        /*
+         * Label directories and character devices "*".
+         * Label symlinks "_".
+         * Don't change anything else.
+         */
+        if (S_ISDIR(sb.st_mode))
+                label = SMACK_STAR_LABEL;
+        else if (S_ISLNK(sb.st_mode))
+                label = SMACK_FLOOR_LABEL;
+        else if (S_ISCHR(sb.st_mode))
+                label = SMACK_STAR_LABEL;
+        else
+                return 0;
 
+        r = setxattr(path, "security.SMACK64", label, strlen(label), 0);
+        if (r < 0) {
+                log_error("Smack relabeling \"%s\" %s", path, strerror(errno));
+                return -errno;
+        }
 #endif
 
+        return r;
+}
+
 int label_init(const char *prefix) {
         int r = 0;
 
@@ -89,14 +134,14 @@ int label_init(const char *prefix) {
         return r;
 }
 
-int label_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
+static int label_fix_selinux(const char *path, bool ignore_enoent, bool ignore_erofs) {
         int r = 0;
 
 #ifdef HAVE_SELINUX
         struct stat st;
         security_context_t fcon;
 
-        if (!use_selinux() || !label_hnd)
+        if (!label_hnd)
                 return 0;
 
         r = lstat(path, &st);
@@ -134,6 +179,24 @@ int label_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
         return r;
 }
 
+int label_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
+        int r = 0;
+
+        if (use_selinux()) {
+                r = label_fix_selinux(path, ignore_enoent, ignore_erofs);
+                if (r < 0)
+                        return r;
+        }
+
+        if (use_smack()) {
+                r = smack_relabel_in_dev(path);
+                if (r < 0)
+                        return r;
+        }
+
+        return r;
+}
+
 void label_finish(void) {
 
 #ifdef HAVE_SELINUX
@@ -259,15 +322,15 @@ void label_free(const char *label) {
 #endif
 }
 
-int label_mkdir(const char *path, mode_t mode) {
+static int label_mkdir_selinux(const char *path, mode_t mode) {
+        int r = 0;
 
-        /* Creates a directory and labels it according to the SELinux policy */
 #ifdef HAVE_SELINUX
+        /* Creates a directory and labels it according to the SELinux policy */
         security_context_t fcon = NULL;
-        int r;
 
-        if (!use_selinux() || !label_hnd)
-                goto skipped;
+        if (!label_hnd)
+                return 0;
 
         if (path_is_absolute(path))
                 r = selabel_lookup_raw(label_hnd, &fcon, path, S_IFDIR);
@@ -300,12 +363,35 @@ int label_mkdir(const char *path, mode_t mode) {
 finish:
         setfscreatecon(NULL);
         freecon(fcon);
+#endif
 
         return r;
+}
 
-skipped:
-#endif
-        return mkdir(path, mode) < 0 ? -errno : 0;
+int label_mkdir(const char *path, mode_t mode) {
+        int r;
+
+        if (use_selinux()) {
+                r = label_mkdir_selinux(path, mode);
+                if (r < 0)
+                        return r;
+        }
+
+        if (use_smack()) {
+                r = mkdir(path, mode);
+                if (r < 0 && errno != EEXIST)
+                        return -errno;
+
+                r = smack_relabel_in_dev(path);
+                if (r < 0)
+                        return r;
+        }
+
+        r = mkdir(path, mode);
+        if (r < 0 && errno != EEXIST)
+                return -errno;
+
+        return 0;
 }
 
 int label_bind(int fd, const struct sockaddr *addr, socklen_t addrlen) {