hfsplus: correct usage of HFSPLUS_ATTR_MAX_STRLEN for non-English attributes

[cascardo/linux.git] / fs / hfsplus / xattr_security.c

diff --git a/fs/hfsplus/xattr_security.c b/fs/hfsplus/xattr_security.c
index 0072276..6ec5e10 100644 (file)
--- a/fs/hfsplus/xattr_security.c
+++ b/fs/hfsplus/xattr_security.c
@@ -7,6 +7,8 @@
  */
 
 #include <linux/security.h>
+#include <linux/nls.h>
+
 #include "hfsplus_fs.h"
 #include "xattr.h"
 #include "acl.h"
@@ -14,37 +16,43 @@
 static int hfsplus_security_getxattr(struct dentry *dentry, const char *name,
                                        void *buffer, size_t size, int type)
 {
-       char xattr_name[HFSPLUS_ATTR_MAX_STRLEN + 1] = {0};
-       size_t len = strlen(name);
+       char *xattr_name;
+       int res;
 
        if (!strcmp(name, ""))
                return -EINVAL;
 
-       if (len + XATTR_SECURITY_PREFIX_LEN > HFSPLUS_ATTR_MAX_STRLEN)
-               return -EOPNOTSUPP;
-
+       xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
+               GFP_KERNEL);
+       if (!xattr_name)
+               return -ENOMEM;
        strcpy(xattr_name, XATTR_SECURITY_PREFIX);
        strcpy(xattr_name + XATTR_SECURITY_PREFIX_LEN, name);
 
-       return hfsplus_getxattr(dentry, xattr_name, buffer, size);
+       res = hfsplus_getxattr(dentry, xattr_name, buffer, size);
+       kfree(xattr_name);
+       return res;
 }
 
 static int hfsplus_security_setxattr(struct dentry *dentry, const char *name,
                const void *buffer, size_t size, int flags, int type)
 {
-       char xattr_name[HFSPLUS_ATTR_MAX_STRLEN + 1] = {0};
-       size_t len = strlen(name);
+       char *xattr_name;
+       int res;
 
        if (!strcmp(name, ""))
                return -EINVAL;
 
-       if (len + XATTR_SECURITY_PREFIX_LEN > HFSPLUS_ATTR_MAX_STRLEN)
-               return -EOPNOTSUPP;
-
+       xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
+               GFP_KERNEL);
+       if (!xattr_name)
+               return -ENOMEM;
        strcpy(xattr_name, XATTR_SECURITY_PREFIX);
        strcpy(xattr_name + XATTR_SECURITY_PREFIX_LEN, name);
 
-       return hfsplus_setxattr(dentry, xattr_name, buffer, size, flags);
+       res = hfsplus_setxattr(dentry, xattr_name, buffer, size, flags);
+       kfree(xattr_name);
+       return res;
 }
 
 static size_t hfsplus_security_listxattr(struct dentry *dentry, char *list,
@@ -62,31 +70,30 @@ static int hfsplus_initxattrs(struct inode *inode,
                                void *fs_info)
 {
        const struct xattr *xattr;
-       char xattr_name[HFSPLUS_ATTR_MAX_STRLEN + 1] = {0};
-       size_t xattr_name_len;
+       char *xattr_name;
        int err = 0;
 
+       xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
+               GFP_KERNEL);
+       if (!xattr_name)
+               return -ENOMEM;
        for (xattr = xattr_array; xattr->name != NULL; xattr++) {
-               xattr_name_len = strlen(xattr->name);
 
-               if (xattr_name_len == 0)
+               if (!strcmp(xattr->name, ""))
                        continue;
 
-               if (xattr_name_len + XATTR_SECURITY_PREFIX_LEN >
-                               HFSPLUS_ATTR_MAX_STRLEN)
-                       return -EOPNOTSUPP;
-
                strcpy(xattr_name, XATTR_SECURITY_PREFIX);
                strcpy(xattr_name +
                        XATTR_SECURITY_PREFIX_LEN, xattr->name);
                memset(xattr_name +
-                       XATTR_SECURITY_PREFIX_LEN + xattr_name_len, 0, 1);
+                       XATTR_SECURITY_PREFIX_LEN + strlen(xattr->name), 0, 1);
 
                err = __hfsplus_setxattr(inode, xattr_name,
                                        xattr->value, xattr->value_len, 0);
                if (err)
                        break;
        }
+       kfree(xattr_name);
        return err;
 }