fs/hfsplus: move xattr_name allocation in hfsplus_setxattr()

security/trusted/user/osx setxattr did the same
xattr_name initialization. Move that operation in hfsplus_setxattr().

Tested with security/trusted/user getfattr/setfattr

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/hfsplus/xattr.c b/fs/hfsplus/xattr.c
index 087f8da9e56549a69699e50618e506427cf022f6..16f545dd929b10e1773352eb5730fcbeb612101c 100644 (file)
--- a/fs/hfsplus/xattr.c
+++ b/fs/hfsplus/xattr.c
@@ -424,6 +424,28 @@ static int copy_name(char *buffer, const char *xattr_name, int name_len)
        return len;
 }
 
+int hfsplus_setxattr(struct dentry *dentry, const char *name,
+                    const void *value, size_t size, int flags,
+                    const char *prefix, size_t prefixlen)
+{
+       char *xattr_name;
+       int res;
+
+       if (!strcmp(name, ""))
+               return -EINVAL;
+
+       xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
+               GFP_KERNEL);
+       if (!xattr_name)
+               return -ENOMEM;
+       strcpy(xattr_name, prefix);
+       strcpy(xattr_name + prefixlen, name);
+       res = __hfsplus_setxattr(dentry->d_inode, xattr_name, value, size,
+                                flags);
+       kfree(xattr_name);
+       return res;
+}
+
 static ssize_t hfsplus_getxattr_finder_info(struct inode *inode,
                                                void *value, size_t size)
 {
@@ -847,9 +869,6 @@ static int hfsplus_osx_getxattr(struct dentry *dentry, const char *name,
 static int hfsplus_osx_setxattr(struct dentry *dentry, const char *name,
                const void *buffer, size_t size, int flags, int type)
 {
-       char *xattr_name;
-       int res;
-
        if (!strcmp(name, ""))
                return -EINVAL;
 
@@ -859,16 +878,10 @@ static int hfsplus_osx_setxattr(struct dentry *dentry, const char *name,
         */
        if (is_known_namespace(name))
                return -EOPNOTSUPP;
-       xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN
-               + XATTR_MAC_OSX_PREFIX_LEN + 1, GFP_KERNEL);
-       if (!xattr_name)
-               return -ENOMEM;
-       strcpy(xattr_name, XATTR_MAC_OSX_PREFIX);
-       strcpy(xattr_name + XATTR_MAC_OSX_PREFIX_LEN, name);
 
-       res = hfsplus_setxattr(dentry, xattr_name, buffer, size, flags);
-       kfree(xattr_name);
-       return res;
+       return hfsplus_setxattr(dentry, name, buffer, size, flags,
+                               XATTR_MAC_OSX_PREFIX,
+                               XATTR_MAC_OSX_PREFIX_LEN);
 }
 
 static size_t hfsplus_osx_listxattr(struct dentry *dentry, char *list,

diff --git a/fs/hfsplus/xattr.h b/fs/hfsplus/xattr.h
index 570d406a65e3bdb7a7241c3777052967a2c1b886..f9b0955b3d281ee93deedf398905bf1c1c64469d 100644 (file)
--- a/fs/hfsplus/xattr.h
+++ b/fs/hfsplus/xattr.h
@@ -21,11 +21,9 @@ extern const struct xattr_handler *hfsplus_xattr_handlers[];
 int __hfsplus_setxattr(struct inode *inode, const char *name,
                        const void *value, size_t size, int flags);
 
-static inline int hfsplus_setxattr(struct dentry *dentry, const char *name,
-                       const void *value, size_t size, int flags)
-{
-       return __hfsplus_setxattr(dentry->d_inode, name, value, size, flags);
-}
+int hfsplus_setxattr(struct dentry *dentry, const char *name,
+                                  const void *value, size_t size, int flags,
+                                  const char *prefix, size_t prefixlen);
 
 ssize_t __hfsplus_getxattr(struct inode *inode, const char *name,
                           void *value, size_t size);

diff --git a/fs/hfsplus/xattr_security.c b/fs/hfsplus/xattr_security.c
index e67d528894483265b94dbef331a867fe4e440614..aacff00a9ff9e77c5d6f6cca250dc90cf4e1cbfc 100644 (file)
--- a/fs/hfsplus/xattr_security.c
+++ b/fs/hfsplus/xattr_security.c
@@ -24,22 +24,9 @@ static int hfsplus_security_getxattr(struct dentry *dentry, const char *name,
 static int hfsplus_security_setxattr(struct dentry *dentry, const char *name,
                const void *buffer, size_t size, int flags, int type)
 {
-       char *xattr_name;
-       int res;
-
-       if (!strcmp(name, ""))
-               return -EINVAL;
-
-       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);
-
-       res = hfsplus_setxattr(dentry, xattr_name, buffer, size, flags);
-       kfree(xattr_name);
-       return res;
+       return hfsplus_setxattr(dentry, name, buffer, size, flags,
+                               XATTR_SECURITY_PREFIX,
+                               XATTR_SECURITY_PREFIX_LEN);
 }
 
 static size_t hfsplus_security_listxattr(struct dentry *dentry, char *list,

diff --git a/fs/hfsplus/xattr_trusted.c b/fs/hfsplus/xattr_trusted.c
index 0b7d78f2d4e9198b1f23ef3aa71f1d7a29b3f70d..bcf65089b7f7f11179d2304a9cee613664d8bd55 100644 (file)
--- a/fs/hfsplus/xattr_trusted.c
+++ b/fs/hfsplus/xattr_trusted.c
@@ -22,22 +22,8 @@ static int hfsplus_trusted_getxattr(struct dentry *dentry, const char *name,
 static int hfsplus_trusted_setxattr(struct dentry *dentry, const char *name,
                const void *buffer, size_t size, int flags, int type)
 {
-       char *xattr_name;
-       int res;
-
-       if (!strcmp(name, ""))
-               return -EINVAL;
-
-       xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
-               GFP_KERNEL);
-       if (!xattr_name)
-               return -ENOMEM;
-       strcpy(xattr_name, XATTR_TRUSTED_PREFIX);
-       strcpy(xattr_name + XATTR_TRUSTED_PREFIX_LEN, name);
-
-       res = hfsplus_setxattr(dentry, xattr_name, buffer, size, flags);
-       kfree(xattr_name);
-       return res;
+       return hfsplus_setxattr(dentry, name, buffer, size, flags,
+                               XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN);
 }
 
 static size_t hfsplus_trusted_listxattr(struct dentry *dentry, char *list,

diff --git a/fs/hfsplus/xattr_user.c b/fs/hfsplus/xattr_user.c
index f8860df288420f631d406f57b92497a748075a1b..5aa0e6dc4a1ee922edbde9ae440ea86572e17bc9 100644 (file)
--- a/fs/hfsplus/xattr_user.c
+++ b/fs/hfsplus/xattr_user.c
@@ -22,22 +22,8 @@ static int hfsplus_user_getxattr(struct dentry *dentry, const char *name,
 static int hfsplus_user_setxattr(struct dentry *dentry, const char *name,
                const void *buffer, size_t size, int flags, int type)
 {
-       char *xattr_name;
-       int res;
-
-       if (!strcmp(name, ""))
-               return -EINVAL;
-
-       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);
-
-       res = hfsplus_setxattr(dentry, xattr_name, buffer, size, flags);
-       kfree(xattr_name);
-       return res;
+       return hfsplus_setxattr(dentry, name, buffer, size, flags,
+                               XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN);
 }
 
 static size_t hfsplus_user_listxattr(struct dentry *dentry, char *list,