Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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: 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 a3cef4cd

fs/hfsplus/xattr.c

+25 −12
Original line number Original line Diff line number Diff line
@@ -424,6 +424,28 @@ static int copy_name(char *buffer, const char *xattr_name, int name_len) 
	return 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,

static ssize_t hfsplus_getxattr_finder_info(struct inode *inode,

						void *value, size_t size)

						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,

static int hfsplus_osx_setxattr(struct dentry *dentry, const char *name,

		const void *buffer, size_t size, int flags, int type)

		const void *buffer, size_t size, int flags, int type)

{

{

	char *xattr_name;

	int res;



	if (!strcmp(name, ""))

	if (!strcmp(name, ""))

		return -EINVAL;

		return -EINVAL;
@@ -859,16 +878,10 @@ static int hfsplus_osx_setxattr(struct dentry *dentry, const char *name, 
	 */

	 */

	if (is_known_namespace(name))

	if (is_known_namespace(name))

		return -EOPNOTSUPP;

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

	return hfsplus_setxattr(dentry, name, buffer, size, flags,

	kfree(xattr_name);

				XATTR_MAC_OSX_PREFIX,

	return res;

				XATTR_MAC_OSX_PREFIX_LEN);

}

}





static size_t hfsplus_osx_listxattr(struct dentry *dentry, char *list,

static size_t hfsplus_osx_listxattr(struct dentry *dentry, char *list,

fs/hfsplus/xattr.h

+3 −5
Original line number Original line Diff line number Diff line
@@ -21,11 +21,9 @@ extern const struct xattr_handler *hfsplus_xattr_handlers[]; 
int __hfsplus_setxattr(struct inode *inode, const char *name,

int __hfsplus_setxattr(struct inode *inode, const char *name,

			const void *value, size_t size, int flags);

			const void *value, size_t size, int flags);





static inline int hfsplus_setxattr(struct dentry *dentry, const char *name,

int hfsplus_setxattr(struct dentry *dentry, const char *name,

			const void *value, size_t size, int flags)

				   const void *value, size_t size, int flags,

{

				   const char *prefix, size_t prefixlen);

	return __hfsplus_setxattr(dentry->d_inode, name, value, size, flags);

}





ssize_t __hfsplus_getxattr(struct inode *inode, const char *name,

ssize_t __hfsplus_getxattr(struct inode *inode, const char *name,

			   void *value, size_t size);

			   void *value, size_t size);

fs/hfsplus/xattr_security.c

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

static int hfsplus_security_setxattr(struct dentry *dentry, const char *name,

		const void *buffer, size_t size, int flags, int type)

		const void *buffer, size_t size, int flags, int type)

{

{

	char *xattr_name;

	return hfsplus_setxattr(dentry, name, buffer, size, flags,

	int res;

				XATTR_SECURITY_PREFIX,



				XATTR_SECURITY_PREFIX_LEN);

	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;

}

}





static size_t hfsplus_security_listxattr(struct dentry *dentry, char *list,

static size_t hfsplus_security_listxattr(struct dentry *dentry, char *list,

fs/hfsplus/xattr_trusted.c

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

static int hfsplus_trusted_setxattr(struct dentry *dentry, const char *name,

		const void *buffer, size_t size, int flags, int type)

		const void *buffer, size_t size, int flags, int type)

{

{

	char *xattr_name;

	return hfsplus_setxattr(dentry, name, buffer, size, flags,

	int res;

				XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN);



	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;

}

}





static size_t hfsplus_trusted_listxattr(struct dentry *dentry, char *list,

static size_t hfsplus_trusted_listxattr(struct dentry *dentry, char *list,

fs/hfsplus/xattr_user.c

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

static int hfsplus_user_setxattr(struct dentry *dentry, const char *name,

		const void *buffer, size_t size, int flags, int type)

		const void *buffer, size_t size, int flags, int type)

{

{

	char *xattr_name;

	return hfsplus_setxattr(dentry, name, buffer, size, flags,

	int res;

				XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN);



	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;

}

}





static size_t hfsplus_user_listxattr(struct dentry *dentry, char *list,

static size_t hfsplus_user_listxattr(struct dentry *dentry, char *list,