1 files changed, 20 insertions, 12 deletions

diff --git a/fs/hfsplus/xattr_user.c b/fs/hfsplus/xattr_user.c
index e34016561ae0..2b625a538b64 100644
--- a/fs/hfsplus/xattr_user.c
+++ b/fs/hfsplus/xattr_user.c
@@ -6,43 +6,51 @@
  * Handler for user extended attributes.
  */
 
+#include <linux/nls.h>
+
 #include "hfsplus_fs.h"
 #include "xattr.h"
 
 static int hfsplus_user_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_USER_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_USER_PREFIX);
         strcpy(xattr_name + XATTR_USER_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_user_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_USER_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_USER_PREFIX);
         strcpy(xattr_name + XATTR_USER_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_user_listxattr(struct dentry *dentry, char *list,