kernfs: fix xattr name handling in LSM helpers

The implementation of kernfs_security_xattr_*() helpers reuses the
kernfs_node_xattr_*() functions, which take the suffix of the xattr name
and extract full xattr name from it using xattr_full_name(). However,
this function relies on the fact that the suffix passed to xattr
handlers from VFS is always constructed from the full name by just
incerementing the pointer. This doesn't necessarily hold for the callers
of kernfs_security_xattr_*(), so their usage will easily lead to
out-of-bounds access.

Fix this by moving the xattr name reconstruction to the VFS xattr
handlers and replacing the kernfs_security_xattr_*() helpers with more
general kernfs_xattr_*() helpers that take full xattr name and allow
accessing all kernfs node's xattrs.

Reported-by: kernel test robot <rong.a.chen@intel.com>
Fixes: b230d5aba2d1 ("LSM: add new hook for kernfs node initialization")
Fixes: ec882da5cda9 ("selinux: implement the kernfs_init_security hook")
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>

diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c
index 673ef598d97d3c362a04dcb0799817b9515a5041..f89a0f13840e57c21bef9180a22e35fb1ed45e0c 100644 (file)
--- a/fs/kernfs/inode.c
+++ b/fs/kernfs/inode.c
@@ -288,63 +288,57 @@ int kernfs_iop_permission(struct inode *inode, int mask)
        return generic_permission(inode, mask);
 }
 
-static int kernfs_node_xattr_get(const struct xattr_handler *handler,
-                                struct kernfs_node *kn, const char *suffix,
-                                void *value, size_t size)
+int kernfs_xattr_get(struct kernfs_node *kn, const char *name,
+                    void *value, size_t size)
 {
-       const char *name = xattr_full_name(handler, suffix);
-       struct kernfs_iattrs *attrs;
-
-       attrs = kernfs_iattrs_noalloc(kn);
+       struct kernfs_iattrs *attrs = kernfs_iattrs_noalloc(kn);
        if (!attrs)
                return -ENODATA;
 
        return simple_xattr_get(&attrs->xattrs, name, value, size);
 }
 
-static int kernfs_node_xattr_set(const struct xattr_handler *handler,
-                                struct kernfs_node *kn, const char *suffix,
-                                const void *value, size_t size, int flags)
+int kernfs_xattr_set(struct kernfs_node *kn, const char *name,
+                    const void *value, size_t size, int flags)
 {
-       const char *name = xattr_full_name(handler, suffix);
-       struct kernfs_iattrs *attrs;
-
-       attrs = kernfs_iattrs(kn);
+       struct kernfs_iattrs *attrs = kernfs_iattrs(kn);
        if (!attrs)
                return -ENOMEM;
 
        return simple_xattr_set(&attrs->xattrs, name, value, size, flags);
 }
 
-static int kernfs_xattr_get(const struct xattr_handler *handler,
-                           struct dentry *unused, struct inode *inode,
-                           const char *suffix, void *value, size_t size)
+static int kernfs_vfs_xattr_get(const struct xattr_handler *handler,
+                               struct dentry *unused, struct inode *inode,
+                               const char *suffix, void *value, size_t size)
 {
+       const char *name = xattr_full_name(handler, suffix);
        struct kernfs_node *kn = inode->i_private;
 
-       return kernfs_node_xattr_get(handler, kn, suffix, value, size);
+       return kernfs_xattr_get(kn, name, value, size);
 }
 
-static int kernfs_xattr_set(const struct xattr_handler *handler,
-                           struct dentry *unused, struct inode *inode,
-                           const char *suffix, const void *value,
-                           size_t size, int flags)
+static int kernfs_vfs_xattr_set(const struct xattr_handler *handler,
+                               struct dentry *unused, struct inode *inode,
+                               const char *suffix, const void *value,
+                               size_t size, int flags)
 {
+       const char *name = xattr_full_name(handler, suffix);
        struct kernfs_node *kn = inode->i_private;
 
-       return kernfs_node_xattr_set(handler, kn, suffix, value, size, flags);
+       return kernfs_xattr_set(kn, name, value, size, flags);
 }
 
 static const struct xattr_handler kernfs_trusted_xattr_handler = {
        .prefix = XATTR_TRUSTED_PREFIX,
-       .get = kernfs_xattr_get,
-       .set = kernfs_xattr_set,
+       .get = kernfs_vfs_xattr_get,
+       .set = kernfs_vfs_xattr_set,
 };
 
 static const struct xattr_handler kernfs_security_xattr_handler = {
        .prefix = XATTR_SECURITY_PREFIX,
-       .get = kernfs_xattr_get,
-       .set = kernfs_xattr_set,
+       .get = kernfs_vfs_xattr_get,
+       .set = kernfs_vfs_xattr_set,
 };
 
 const struct xattr_handler *kernfs_xattr_handlers[] = {
@@ -352,17 +346,3 @@ const struct xattr_handler *kernfs_xattr_handlers[] = {
        &kernfs_security_xattr_handler,
        NULL
 };
-
-int kernfs_security_xattr_get(struct kernfs_node *kn, const char *suffix,
-                             void *value, size_t size)
-{
-       return kernfs_node_xattr_get(&kernfs_security_xattr_handler,
-                                    kn, suffix, value, size);
-}
-
-int kernfs_security_xattr_set(struct kernfs_node *kn, const char *suffix,
-                             void *value, size_t size, int flags)
-{
-       return kernfs_node_xattr_set(&kernfs_security_xattr_handler,
-                                    kn, suffix, value, size, flags);
-}

diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h
index 39eea07c2900b15ee9d1a3f8d3b9655feb2cc3b3..7987e0f89b692da99b0e346e8facf060235a3ff2 100644 (file)
--- a/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@ -371,10 +371,10 @@ __poll_t kernfs_generic_poll(struct kernfs_open_file *of,
                             struct poll_table_struct *pt);
 void kernfs_notify(struct kernfs_node *kn);
 
-int kernfs_security_xattr_get(struct kernfs_node *kn, const char *suffix,
-                             void *value, size_t size);
-int kernfs_security_xattr_set(struct kernfs_node *kn, const char *suffix,
-                             void *value, size_t size, int flags);
+int kernfs_xattr_get(struct kernfs_node *kn, const char *name,
+                    void *value, size_t size);
+int kernfs_xattr_set(struct kernfs_node *kn, const char *name,
+                    const void *value, size_t size, int flags);
 
 const void *kernfs_super_ns(struct super_block *sb);
 int kernfs_get_tree(struct fs_context *fc);
@@ -478,14 +478,12 @@ static inline int kernfs_setattr(struct kernfs_node *kn,
 
 static inline void kernfs_notify(struct kernfs_node *kn) { }
 
-static inline int kernfs_security_xattr_get(struct kernfs_node *kn,
-                                           const char *suffix, void *value,
-                                           size_t size)
+static inline int kernfs_xattr_get(struct kernfs_node *kn, const char *name,
+                                  void *value, size_t size)
 { return -ENOSYS; }
 
-static inline int kernfs_security_xattr_set(struct kernfs_node *kn,
-                                           const char *suffix, void *value,
-                                           size_t size, int flags)
+static inline int kernfs_xattr_set(struct kernfs_node *kn, const char *name,
+                                  const void *value, size_t size, int flags)
 { return -ENOSYS; }
 
 static inline const void *kernfs_super_ns(struct super_block *sb)

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index b6e61524d68d25ce65a5f96ca4c5ed0f78b548f4..d5fdcb0d26fe7e3116541af083bc9f7ff4c85374 100644 (file)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3394,7 +3394,7 @@ static int selinux_kernfs_init_security(struct kernfs_node *kn_dir,
        int rc;
        char *context;
 
-       rc = kernfs_security_xattr_get(kn_dir, XATTR_SELINUX_SUFFIX, NULL, 0);
+       rc = kernfs_xattr_get(kn_dir, XATTR_NAME_SELINUX, NULL, 0);
        if (rc == -ENODATA)
                return 0;
        else if (rc < 0)
@@ -3405,8 +3405,7 @@ static int selinux_kernfs_init_security(struct kernfs_node *kn_dir,
        if (!context)
                return -ENOMEM;
 
-       rc = kernfs_security_xattr_get(kn_dir, XATTR_SELINUX_SUFFIX, context,
-                                      clen);
+       rc = kernfs_xattr_get(kn_dir, XATTR_NAME_SELINUX, context, clen);
        if (rc < 0) {
                kfree(context);
                return rc;
@@ -3439,8 +3438,8 @@ static int selinux_kernfs_init_security(struct kernfs_node *kn_dir,
        if (rc)
                return rc;
 
-       rc = kernfs_security_xattr_set(kn, XATTR_SELINUX_SUFFIX, context, clen,
-                                      XATTR_CREATE);
+       rc = kernfs_xattr_set(kn, XATTR_NAME_SELINUX, context, clen,
+                             XATTR_CREATE);
        kfree(context);
        return rc;
 }