X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fudev-node.c;h=0429c35ff7fc1a2b1a0a9e7f8d053e5356995d90;hp=6c9bef331ec6d9ccc2eb28ef82a511f1ce707374;hb=4987623d011c534a22a490b17a8e0ec81d1ac30c;hpb=c26547d612733371494330e26c7d3604a5dba3d9

diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index 6c9bef331..0429c35ff 100644
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -28,11 +28,9 @@
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#ifdef HAVE_XATTR
-#include <attr/xattr.h>
-#endif
 
 #include "udev.h"
+#include "smack-util.h"
 
 static int node_symlink(struct udev_device *dev, const char *node, const char *slink)
 {
@@ -283,6 +281,9 @@ static int node_permissions_apply(struct udev_device *dev, bool apply,
         }
 
         if (apply) {
+                bool selinux = false;
+                bool smack = false;
+
                 if ((stats.st_mode & 0777) != (mode & 0777) || stats.st_uid != uid || stats.st_gid != gid) {
                         log_debug("set permissions %s, %#o, uid=%u, gid=%u\n", devnode, mode, uid, gid);
                         chmod(devnode, mode);
@@ -291,8 +292,6 @@ static int node_permissions_apply(struct udev_device *dev, bool apply,
                         log_debug("preserve permissions %s, %#o, uid=%u, gid=%u\n", devnode, mode, uid, gid);
                 }
 
-                label_fix(devnode, true, false);
-
                 /* apply SECLABEL{$module}=$label */
                 udev_list_entry_foreach(entry, udev_list_get_entry(seclabel_list)) {
                         const char *name, *label;
@@ -301,20 +300,28 @@ static int node_permissions_apply(struct udev_device *dev, bool apply,
                         label = udev_list_entry_get_value(entry);
 
                         if (streq(name, "selinux")) {
-                                /* FIXME: hook up libselinux */
-                                log_error("SECLABEL: failed to set selinux label '%s'", label);
+                                selinux = true;
+                                if (label_apply(devnode, label) < 0)
+                                        log_error("SECLABEL: failed to set SELinux label '%s'", label);
+                                else
+                                        log_debug("SECLABEL: set SELinux label '%s'", label);
 
                         } else if (streq(name, "smack")) {
-#ifdef HAVE_XATTR
-                                if (lsetxattr(devnode, "security.SMACK64", label, strlen(label), 0) < 0)
+                                smack = true;
+                                if (smack_label_path(devnode, label) < 0)
                                         log_error("SECLABEL: failed to set SMACK label '%s'", label);
                                 else
                                         log_debug("SECLABEL: set SMACK label '%s'", label);
-#endif
 
                         } else
                                 log_error("SECLABEL: unknown subsystem, ignoring '%s'='%s'", name, label);
                 }
+
+                /* set the defaults */
+                if (!selinux)
+                        label_fix(devnode, true, false);
+                if (!smack)
+                        smack_label_path(devnode, NULL);
         }
 
         /* always update timestamp when we re-use the node, like on media change events */