fs/hfsplus: move xattr_name allocation in hfsplus_getxattr()

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

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 d98094a9f4769f698bd4495dfdc7a817c7e0065c..087f8da9e56549a69699e50618e506427cf022f6 100644 (file)
--- a/fs/hfsplus/xattr.c
+++ b/fs/hfsplus/xattr.c
@@ -560,6 +560,30 @@ failed_getxattr_init:
        return res;
 }
 
+ssize_t hfsplus_getxattr(struct dentry *dentry, const char *name,
+                        void *value, size_t size,
+                        const char *prefix, size_t prefixlen)
+{
+       int res;
+       char *xattr_name;
+
+       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_getxattr(dentry->d_inode, xattr_name, value, size);
+       kfree(xattr_name);
+       return res;
+
+}
+
 static inline int can_list(const char *xattr_name)
 {
        if (!xattr_name)
@@ -806,9 +830,6 @@ end_removexattr:
 static int hfsplus_osx_getxattr(struct dentry *dentry, const char *name,
                                        void *buffer, size_t size, int type)
 {
-       char *xattr_name;
-       int res;
-
        if (!strcmp(name, ""))
                return -EINVAL;
 
@@ -818,16 +839,9 @@ static int hfsplus_osx_getxattr(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_getxattr(dentry, xattr_name, buffer, size);
-       kfree(xattr_name);
-       return res;
+       return hfsplus_getxattr(dentry, name, buffer, size,
+                               XATTR_MAC_OSX_PREFIX, XATTR_MAC_OSX_PREFIX_LEN);
 }
 
 static int hfsplus_osx_setxattr(struct dentry *dentry, const char *name,

diff --git a/fs/hfsplus/xattr.h b/fs/hfsplus/xattr.h
index 288530cf80b5fe5555f05294d24710868ac3b46a..570d406a65e3bdb7a7241c3777052967a2c1b886 100644 (file)
--- a/fs/hfsplus/xattr.h
+++ b/fs/hfsplus/xattr.h
@@ -28,15 +28,11 @@ static inline int hfsplus_setxattr(struct dentry *dentry, const char *name,
 }
 
 ssize_t __hfsplus_getxattr(struct inode *inode, const char *name,
-                       void *value, size_t size);
+                          void *value, size_t size);
 
-static inline ssize_t hfsplus_getxattr(struct dentry *dentry,
-                                       const char *name,
-                                       void *value,
-                                       size_t size)
-{
-       return __hfsplus_getxattr(dentry->d_inode, name, value, size);
-}
+ssize_t hfsplus_getxattr(struct dentry *dentry, const char *name,
+                        void *value, size_t size,
+                        const char *prefix, size_t prefixlen);
 
 ssize_t hfsplus_listxattr(struct dentry *dentry, char *buffer, size_t size);
 

diff --git a/fs/hfsplus/xattr_security.c b/fs/hfsplus/xattr_security.c
index 6ec5e107691f47841f536de29d039e31878a3033..e67d528894483265b94dbef331a867fe4e440614 100644 (file)
--- a/fs/hfsplus/xattr_security.c
+++ b/fs/hfsplus/xattr_security.c
@@ -16,22 +16,9 @@
 static int hfsplus_security_getxattr(struct dentry *dentry, const char *name,
                                        void *buffer, size_t size, 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_getxattr(dentry, xattr_name, buffer, size);
-       kfree(xattr_name);
-       return res;
+       return hfsplus_getxattr(dentry, name, buffer, size,
+                               XATTR_SECURITY_PREFIX,
+                               XATTR_SECURITY_PREFIX_LEN);
 }
 
 static int hfsplus_security_setxattr(struct dentry *dentry, const char *name,

diff --git a/fs/hfsplus/xattr_trusted.c b/fs/hfsplus/xattr_trusted.c
index 3c5f27e4746a918a208946691699c81cf76da8cf..0b7d78f2d4e9198b1f23ef3aa71f1d7a29b3f70d 100644 (file)
--- a/fs/hfsplus/xattr_trusted.c
+++ b/fs/hfsplus/xattr_trusted.c
@@ -14,22 +14,9 @@
 static int hfsplus_trusted_getxattr(struct dentry *dentry, const char *name,
                                        void *buffer, size_t size, 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_getxattr(dentry, xattr_name, buffer, size);
-       kfree(xattr_name);
-       return res;
+       return hfsplus_getxattr(dentry, name, buffer, size,
+                               XATTR_TRUSTED_PREFIX,
+                               XATTR_TRUSTED_PREFIX_LEN);
 }
 
 static int hfsplus_trusted_setxattr(struct dentry *dentry, const char *name,

diff --git a/fs/hfsplus/xattr_user.c b/fs/hfsplus/xattr_user.c
index 2b625a538b64aab71ab0ee6b3b322aecab09134e..f8860df288420f631d406f57b92497a748075a1b 100644 (file)
--- a/fs/hfsplus/xattr_user.c
+++ b/fs/hfsplus/xattr_user.c
@@ -14,22 +14,9 @@
 static int hfsplus_user_getxattr(struct dentry *dentry, const char *name,
                                        void *buffer, size_t size, 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_getxattr(dentry, xattr_name, buffer, size);
-       kfree(xattr_name);
-       return res;
+       return hfsplus_getxattr(dentry, name, buffer, size,
+                               XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN);
 }
 
 static int hfsplus_user_setxattr(struct dentry *dentry, const char *name,