Commit a3cef4cd authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds
Browse files

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: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f01fa5fb

fs/hfsplus/xattr.c

+26 −12
Original line number Diff line number Diff line
@@ -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,

fs/hfsplus/xattr.h

+4 −8
Original line number Diff line number Diff line
@@ -30,13 +30,9 @@ 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);



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);

fs/hfsplus/xattr_security.c

+3 −16
Original line number Diff line number Diff line
@@ -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,

fs/hfsplus/xattr_trusted.c

+3 −16
Original line number Diff line number Diff line
@@ -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,

fs/hfsplus/xattr_user.c

+2 −15
Original line number Diff line number Diff line
@@ -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,