These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / fs / squashfs / xattr.c

diff --git a/kernel/fs/squashfs/xattr.c b/kernel/fs/squashfs/xattr.c
index e5e0ddf..6a4cc34 100644 (file)
--- a/kernel/fs/squashfs/xattr.c
+++ b/kernel/fs/squashfs/xattr.c
@@ -68,8 +68,8 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
                name_size = le16_to_cpu(entry.size);
                handler = squashfs_xattr_handler(le16_to_cpu(entry.type));
                if (handler)
-                       prefix_size = handler->list(d, buffer, rest, NULL,
-                               name_size, handler->flags);
+                       prefix_size = handler->list(handler, d, buffer, rest,
+                                                   NULL, name_size);
                if (prefix_size) {
                        if (buffer) {
                                if (prefix_size + name_size + 1 > rest) {
@@ -212,88 +212,68 @@ failed:
 }
 
 
-/*
- * User namespace support
- */
-static size_t squashfs_user_list(struct dentry *d, char *list, size_t list_size,
-       const char *name, size_t name_len, int type)
+static size_t squashfs_xattr_handler_list(const struct xattr_handler *handler,
+                                         struct dentry *d, char *list,
+                                         size_t list_size, const char *name,
+                                         size_t name_len)
 {
-       if (list && XATTR_USER_PREFIX_LEN <= list_size)
-               memcpy(list, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN);
-       return XATTR_USER_PREFIX_LEN;
+       int len = strlen(handler->prefix);
+
+       if (list && len <= list_size)
+               memcpy(list, handler->prefix, len);
+       return len;
 }
 
-static int squashfs_user_get(struct dentry *d, const char *name, void *buffer,
-       size_t size, int type)
+static int squashfs_xattr_handler_get(const struct xattr_handler *handler,
+                                     struct dentry *d, const char *name,
+                                     void *buffer, size_t size)
 {
        if (name[0] == '\0')
                return  -EINVAL;
 
-       return squashfs_xattr_get(d_inode(d), SQUASHFS_XATTR_USER, name,
+       return squashfs_xattr_get(d_inode(d), handler->flags, name,
                buffer, size);
 }
 
+/*
+ * User namespace support
+ */
 static const struct xattr_handler squashfs_xattr_user_handler = {
        .prefix = XATTR_USER_PREFIX,
-       .list   = squashfs_user_list,
-       .get    = squashfs_user_get
+       .flags  = SQUASHFS_XATTR_USER,
+       .list   = squashfs_xattr_handler_list,
+       .get    = squashfs_xattr_handler_get
 };
 
 /*
  * Trusted namespace support
  */
-static size_t squashfs_trusted_list(struct dentry *d, char *list,
-       size_t list_size, const char *name, size_t name_len, int type)
+static size_t squashfs_trusted_xattr_handler_list(const struct xattr_handler *handler,
+                                                 struct dentry *d, char *list,
+                                                 size_t list_size, const char *name,
+                                                 size_t name_len)
 {
        if (!capable(CAP_SYS_ADMIN))
                return 0;
-
-       if (list && XATTR_TRUSTED_PREFIX_LEN <= list_size)
-               memcpy(list, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN);
-       return XATTR_TRUSTED_PREFIX_LEN;
-}
-
-static int squashfs_trusted_get(struct dentry *d, const char *name,
-       void *buffer, size_t size, int type)
-{
-       if (name[0] == '\0')
-               return  -EINVAL;
-
-       return squashfs_xattr_get(d_inode(d), SQUASHFS_XATTR_TRUSTED, name,
-               buffer, size);
+       return squashfs_xattr_handler_list(handler, d, list, list_size, name,
+                                          name_len);
 }
 
 static const struct xattr_handler squashfs_xattr_trusted_handler = {
        .prefix = XATTR_TRUSTED_PREFIX,
-       .list   = squashfs_trusted_list,
-       .get    = squashfs_trusted_get
+       .flags  = SQUASHFS_XATTR_TRUSTED,
+       .list   = squashfs_trusted_xattr_handler_list,
+       .get    = squashfs_xattr_handler_get
 };
 
 /*
  * Security namespace support
  */
-static size_t squashfs_security_list(struct dentry *d, char *list,
-       size_t list_size, const char *name, size_t name_len, int type)
-{
-       if (list && XATTR_SECURITY_PREFIX_LEN <= list_size)
-               memcpy(list, XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN);
-       return XATTR_SECURITY_PREFIX_LEN;
-}
-
-static int squashfs_security_get(struct dentry *d, const char *name,
-       void *buffer, size_t size, int type)
-{
-       if (name[0] == '\0')
-               return  -EINVAL;
-
-       return squashfs_xattr_get(d_inode(d), SQUASHFS_XATTR_SECURITY, name,
-               buffer, size);
-}
-
 static const struct xattr_handler squashfs_xattr_security_handler = {
        .prefix = XATTR_SECURITY_PREFIX,
-       .list   = squashfs_security_list,
-       .get    = squashfs_security_get
+       .flags  = SQUASHFS_XATTR_SECURITY,
+       .list   = squashfs_xattr_handler_list,
+       .get    = squashfs_xattr_handler_get
 };
 
 static const struct xattr_handler *squashfs_xattr_handler(int type)