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>
This commit is contained in:
parent
f01fa5fb35
commit
a3cef4cd68
|
@ -560,6 +560,30 @@ failed_getxattr_init:
|
||||||
return res;
|
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)
|
static inline int can_list(const char *xattr_name)
|
||||||
{
|
{
|
||||||
if (!xattr_name)
|
if (!xattr_name)
|
||||||
|
@ -806,9 +830,6 @@ end_removexattr:
|
||||||
static int hfsplus_osx_getxattr(struct dentry *dentry, const char *name,
|
static int hfsplus_osx_getxattr(struct dentry *dentry, const char *name,
|
||||||
void *buffer, size_t size, int type)
|
void *buffer, size_t size, int type)
|
||||||
{
|
{
|
||||||
char *xattr_name;
|
|
||||||
int res;
|
|
||||||
|
|
||||||
if (!strcmp(name, ""))
|
if (!strcmp(name, ""))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
@ -818,16 +839,9 @@ static int hfsplus_osx_getxattr(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_getxattr(dentry, xattr_name, buffer, size);
|
return hfsplus_getxattr(dentry, name, buffer, size,
|
||||||
kfree(xattr_name);
|
XATTR_MAC_OSX_PREFIX, XATTR_MAC_OSX_PREFIX_LEN);
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int hfsplus_osx_setxattr(struct dentry *dentry, const char *name,
|
static int hfsplus_osx_setxattr(struct dentry *dentry, const char *name,
|
||||||
|
|
|
@ -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,
|
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,
|
ssize_t hfsplus_getxattr(struct dentry *dentry, const char *name,
|
||||||
const char *name,
|
void *value, size_t size,
|
||||||
void *value,
|
const char *prefix, size_t prefixlen);
|
||||||
size_t size)
|
|
||||||
{
|
|
||||||
return __hfsplus_getxattr(dentry->d_inode, name, value, size);
|
|
||||||
}
|
|
||||||
|
|
||||||
ssize_t hfsplus_listxattr(struct dentry *dentry, char *buffer, size_t size);
|
ssize_t hfsplus_listxattr(struct dentry *dentry, char *buffer, size_t size);
|
||||||
|
|
||||||
|
|
|
@ -16,22 +16,9 @@
|
||||||
static int hfsplus_security_getxattr(struct dentry *dentry, const char *name,
|
static int hfsplus_security_getxattr(struct dentry *dentry, const char *name,
|
||||||
void *buffer, size_t size, int type)
|
void *buffer, size_t size, int type)
|
||||||
{
|
{
|
||||||
char *xattr_name;
|
return hfsplus_getxattr(dentry, name, buffer, size,
|
||||||
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_getxattr(dentry, xattr_name, buffer, size);
|
|
||||||
kfree(xattr_name);
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int hfsplus_security_setxattr(struct dentry *dentry, const char *name,
|
static int hfsplus_security_setxattr(struct dentry *dentry, const char *name,
|
||||||
|
|
|
@ -14,22 +14,9 @@
|
||||||
static int hfsplus_trusted_getxattr(struct dentry *dentry, const char *name,
|
static int hfsplus_trusted_getxattr(struct dentry *dentry, const char *name,
|
||||||
void *buffer, size_t size, int type)
|
void *buffer, size_t size, int type)
|
||||||
{
|
{
|
||||||
char *xattr_name;
|
return hfsplus_getxattr(dentry, name, buffer, size,
|
||||||
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_getxattr(dentry, xattr_name, buffer, size);
|
|
||||||
kfree(xattr_name);
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int hfsplus_trusted_setxattr(struct dentry *dentry, const char *name,
|
static int hfsplus_trusted_setxattr(struct dentry *dentry, const char *name,
|
||||||
|
|
|
@ -14,22 +14,9 @@
|
||||||
static int hfsplus_user_getxattr(struct dentry *dentry, const char *name,
|
static int hfsplus_user_getxattr(struct dentry *dentry, const char *name,
|
||||||
void *buffer, size_t size, int type)
|
void *buffer, size_t size, int type)
|
||||||
{
|
{
|
||||||
char *xattr_name;
|
|
||||||
int res;
|
|
||||||
|
|
||||||
if (!strcmp(name, ""))
|
return hfsplus_getxattr(dentry, name, buffer, size,
|
||||||
return -EINVAL;
|
XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN);
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int hfsplus_user_setxattr(struct dentry *dentry, const char *name,
|
static int hfsplus_user_setxattr(struct dentry *dentry, const char *name,
|
||||||
|
|
Loading…
Reference in New Issue