LU-12355 llite: include file linux/selinux.h removed

[fs/lustre-release.git] / lustre / llite / xattr_security.c

diff --git a/lustre/llite/xattr_security.c b/lustre/llite/xattr_security.c
index 0ac19f7..e2bfe61 100644 (file)
--- a/lustre/llite/xattr_security.c
+++ b/lustre/llite/xattr_security.c
@@ -33,7 +33,9 @@
 
 #include <linux/types.h>
 #include <linux/security.h>
+#ifdef HAVE_LINUX_SELINUX_IS_ENABLED
 #include <linux/selinux.h>
+#endif
 #include <linux/xattr.h>
 #include "llite_internal.h"
 
@@ -55,7 +57,8 @@ int ll_dentry_init_security(struct dentry *dentry, int mode, struct qstr *name,
 #ifdef HAVE_SECURITY_DENTRY_INIT_SECURITY
        int rc;
 
-       /* security_dentry_init_security() is strange. Like
+       /*
+        * security_dentry_init_security() is strange. Like
         * security_inode_init_security() it may return a context (provided a
         * Linux security module is enabled) but unlike
         * security_inode_init_security() it does not return to us the name of
@@ -65,13 +68,16 @@ int ll_dentry_init_security(struct dentry *dentry, int mode, struct qstr *name,
         * SELinux is the only module that implements
         * security_dentry_init_security(). Note that the NFS client code just
         * calls it and assumes that if anything is returned then it must come
-        * from SELinux. */
+        * from SELinux.
+        */
 
        if (!selinux_is_enabled())
                return 0;
 
        rc = security_dentry_init_security(dentry, mode, name, secctx,
                                           secctx_size);
+       if (rc == -EOPNOTSUPP)
+               return 0;
        if (rc < 0)
                return rc;
 
@@ -98,26 +104,23 @@ static int
 ll_initxattrs(struct inode *inode, const struct xattr *xattr_array,
              void *fs_info)
 {
-       const struct xattr *xattr;
        struct dentry *dentry = fs_info;
-       size_t name_len;
-       char *full_name;
+       const struct xattr *xattr;
        int err = 0;
 
-       for (xattr = xattr_array; xattr->name != NULL; xattr++) {
-               name_len = strlen(XATTR_SECURITY_PREFIX) + strlen(xattr->name)
-                          + 1;
-               OBD_ALLOC(full_name, name_len);
-               if (full_name == NULL)
-                       return -ENOMEM;
-               strlcpy(full_name, XATTR_SECURITY_PREFIX, name_len);
-               strlcat(full_name, xattr->name, name_len);
-
-               err = ll_setxattr(dentry, full_name, xattr->value,
-                                 xattr->value_len, 0);
+       for (xattr = xattr_array; xattr->name; xattr++) {
+               char *full_name;
 
-               OBD_FREE(full_name, name_len);
+               full_name = kasprintf(GFP_KERNEL, "%s%s",
+                                     XATTR_SECURITY_PREFIX, xattr->name);
+               if (!full_name) {
+                       err = -ENOMEM;
+                       break;
+               }
 
+               err = __vfs_setxattr(dentry, inode, full_name, xattr->value,
+                                    xattr->value_len, XATTR_CREATE);
+               kfree(full_name);
                if (err < 0)
                        break;
        }
@@ -138,11 +141,17 @@ int
 ll_inode_init_security(struct dentry *dentry, struct inode *inode,
                       struct inode *dir)
 {
+       int rc;
+
        if (!selinux_is_enabled())
                return 0;
 
-       return ll_security_inode_init_security(inode, dir, NULL, NULL, 0,
-                                              &ll_initxattrs, dentry);
+       rc = ll_security_inode_init_security(inode, dir, NULL, NULL, 0,
+                                             &ll_initxattrs, dentry);
+       if (rc == -EOPNOTSUPP)
+               return 0;
+
+       return rc;
 }
 #else /* !HAVE_SECURITY_IINITSEC_CALLBACK */
 /**
@@ -159,10 +168,11 @@ int
 ll_inode_init_security(struct dentry *dentry, struct inode *inode,
                       struct inode *dir)
 {
-       int err;
-       size_t len, name_len;
+       char *full_name;
        void *value;
-       char *name, *full_name;
+       char *name;
+       size_t len;
+       int err;
 
        if (!selinux_is_enabled())
                return 0;
@@ -175,16 +185,13 @@ ll_inode_init_security(struct dentry *dentry, struct inode *inode,
                return err;
        }
 
-       name_len = strlen(XATTR_SECURITY_PREFIX) + strlen(name) + 1;
-       OBD_ALLOC(full_name, name_len);
-       if (full_name == NULL)
+       full_name = kasprintf(GFP_KERNEL, "%s%s", XATTR_SECURITY_PREFIX, name);
+       if (!full_name)
                GOTO(out_free, err = -ENOMEM);
-       strlcpy(full_name, XATTR_SECURITY_PREFIX, name_len);
-       strlcat(full_name, name, name_len);
-
-       err = ll_setxattr(dentry, full_name, value, len, 0);
-       OBD_FREE(full_name, name_len);
 
+       err = __vfs_setxattr(dentry, inode, full_name, value, len,
+                            XATTR_CREATE);
+       kfree(full_name);
 out_free:
        kfree(name);
        kfree(value);
@@ -192,3 +199,36 @@ out_free:
        return err;
 }
 #endif /* HAVE_SECURITY_IINITSEC_CALLBACK */
+
+/**
+ * Get security context xattr name used by policy.
+ *
+ * \retval >= 0     length of xattr name
+ * \retval < 0      failure to get security context xattr name
+ */
+int
+ll_listsecurity(struct inode *inode, char *secctx_name, size_t secctx_name_size)
+{
+       int rc;
+
+       if (!selinux_is_enabled())
+               return 0;
+
+#ifdef HAVE_SECURITY_INODE_LISTSECURITY
+       rc = security_inode_listsecurity(inode, secctx_name, secctx_name_size);
+       if (rc >= secctx_name_size)
+               rc = -ERANGE;
+       else if (rc >= 0)
+               secctx_name[rc] = '\0';
+       return rc;
+#else /* !HAVE_SECURITY_INODE_LISTSECURITY */
+       rc = sizeof(XATTR_NAME_SELINUX);
+       if (secctx_name && rc < secctx_name_size) {
+               memcpy(secctx_name, XATTR_NAME_SELINUX, rc);
+               secctx_name[rc] = '\0';
+       } else {
+               rc = -ERANGE;
+       }
+       return rc;
+#endif /* HAVE_SECURITY_INODE_LISTSECURITY */
+}