X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fsmack-util.c;h=64e213489e21726047f71f6898e4f5fd8536fbbf;hp=7726d69b0fce607035ee8365d34c9c0e8fd1ca3c;hb=a354329f724d6ce913d2ccffb2be8f3327a67faa;hpb=c80d766c8072dd0be311dcd31c17f9719775be44

diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c
index 7726d69b0..64e213489 100644
--- a/src/shared/smack-util.c
+++ b/src/shared/smack-util.c
@@ -25,8 +25,12 @@
 
 #include "util.h"
 #include "path-util.h"
+#include "fileio.h"
 #include "smack-util.h"
 
+#define SMACK_FLOOR_LABEL "_"
+#define SMACK_STAR_LABEL  "*"
+
 bool mac_smack_use(void) {
 #ifdef HAVE_SMACK
         static int cached_use = -1;
@@ -38,91 +42,164 @@ bool mac_smack_use(void) {
 #else
         return false;
 #endif
-
 }
 
 int mac_smack_apply(const char *path, const char *label) {
+        int r = 0;
+
+        assert(path);
+
 #ifdef HAVE_SMACK
         if (!mac_smack_use())
                 return 0;
 
         if (label)
-                return setxattr(path, "security.SMACK64", label, strlen(label), 0);
+                r = lsetxattr(path, "security.SMACK64", label, strlen(label), 0);
         else
-                return lremovexattr(path, "security.SMACK64");
-#else
-        return 0;
+                r = lremovexattr(path, "security.SMACK64");
+        if (r < 0)
+                return -errno;
 #endif
+
+        return r;
 }
 
 int mac_smack_apply_fd(int fd, const char *label) {
+        int r = 0;
+
+        assert(fd >= 0);
+
 #ifdef HAVE_SMACK
         if (!mac_smack_use())
                 return 0;
 
-        return fsetxattr(fd, "security.SMACK64", label, strlen(label), 0);
-#else
-        return 0;
+        if (label)
+                r = fsetxattr(fd, "security.SMACK64", label, strlen(label), 0);
+        else
+                r = fremovexattr(fd, "security.SMACK64");
+        if (r < 0)
+                return -errno;
 #endif
+
+        return r;
 }
 
 int mac_smack_apply_ip_out_fd(int fd, const char *label) {
+        int r = 0;
+
+        assert(fd >= 0);
+
 #ifdef HAVE_SMACK
         if (!mac_smack_use())
                 return 0;
 
-        return fsetxattr(fd, "security.SMACK64IPOUT", label, strlen(label), 0);
-#else
-        return 0;
+        if (label)
+                r = fsetxattr(fd, "security.SMACK64IPOUT", label, strlen(label), 0);
+        else
+                r = fremovexattr(fd, "security.SMACK64IPOUT");
+        if (r < 0)
+                return -errno;
 #endif
+
+        return r;
 }
 
 int mac_smack_apply_ip_in_fd(int fd, const char *label) {
+        int r = 0;
+
+        assert(fd >= 0);
+
 #ifdef HAVE_SMACK
         if (!mac_smack_use())
                 return 0;
 
-        return fsetxattr(fd, "security.SMACK64IPIN", label, strlen(label), 0);
-#else
-        return 0;
+        if (label)
+                r = fsetxattr(fd, "security.SMACK64IPIN", label, strlen(label), 0);
+        else
+                r = fremovexattr(fd, "security.SMACK64IPIN");
+        if (r < 0)
+                return -errno;
 #endif
+
+        return r;
 }
 
-int mac_smack_fix(const char *path) {
-        int r = 0;
+int mac_smack_apply_pid(pid_t pid, const char *label) {
 
 #ifdef HAVE_SMACK
-        struct stat sb;
-        const char *label;
+        const char *p;
+#endif
+        int r = 0;
 
-        /*
-         * Path must be in /dev and must exist
-         */
-        if (!path_startswith(path, "/dev"))
+        assert(label);
+
+#ifdef HAVE_SMACK
+        if (!mac_smack_use())
                 return 0;
 
-        r = lstat(path, &sb);
+        p = procfs_file_alloca(pid, "attr/current");
+        r = write_string_file(p, label);
         if (r < 0)
-                return -errno;
+                return r;
+#endif
+
+        return r;
+}
+
+int mac_smack_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
+
+#ifdef HAVE_SMACK
+        struct stat st;
+#endif
+        int r = 0;
+
+        assert(path);
+
+#ifdef HAVE_SMACK
+        if (!mac_smack_use())
+                return 0;
 
         /*
-         * Label directories and character devices "*".
-         * Label symlinks "_".
-         * Don't change anything else.
+         * Path must be in /dev and must exist
          */
-        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
+        if (!path_startswith(path, "/dev"))
                 return 0;
 
-        r = setxattr(path, "security.SMACK64", label, strlen(label), 0);
+        r = lstat(path, &st);
+        if (r >= 0) {
+                const char *label;
+
+                /*
+                 * Label directories and character devices "*".
+                 * Label symlinks "_".
+                 * Don't change anything else.
+                 */
+
+                if (S_ISDIR(st.st_mode))
+                        label = SMACK_STAR_LABEL;
+                else if (S_ISLNK(st.st_mode))
+                        label = SMACK_FLOOR_LABEL;
+                else if (S_ISCHR(st.st_mode))
+                        label = SMACK_STAR_LABEL;
+                else
+                        return 0;
+
+                r = lsetxattr(path, "security.SMACK64", label, strlen(label), 0);
+
+                /* If the FS doesn't support labels, then exit without warning */
+                if (r < 0 && errno == ENOTSUP)
+                        return 0;
+        }
+
         if (r < 0) {
-                log_error("Smack relabeling \"%s\" %m", path);
-                return -errno;
+                /* Ignore ENOENT in some cases */
+                if (ignore_enoent && errno == ENOENT)
+                        return 0;
+
+                if (ignore_erofs && errno == EROFS)
+                        return 0;
+
+                r = log_debug_errno(errno, "Unable to fix SMACK label of %s: %m", path);
         }
 #endif