summaryrefslogtreecommitdiffstats
path: root/fs/hfsplus/xattr_trusted.c
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2015-04-16 12:47:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-17 09:04:05 -0400
commit5e61473ea9f1ed6537ffaf6bf1cb60655f0d1b2c (patch)
tree4ee3f0645b0a060a78945e8ce214c75f31fffa22 /fs/hfsplus/xattr_trusted.c
parenta3cef4cd6886c755d2148739699751900b51a365 (diff)
downloadlinux-stable-5e61473ea9f1ed6537ffaf6bf1cb60655f0d1b2c.tar.gz
linux-stable-5e61473ea9f1ed6537ffaf6bf1cb60655f0d1b2c.tar.bz2
linux-stable-5e61473ea9f1ed6537ffaf6bf1cb60655f0d1b2c.zip
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>
Diffstat (limited to 'fs/hfsplus/xattr_trusted.c')
-rw-r--r--fs/hfsplus/xattr_trusted.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/fs/hfsplus/xattr_trusted.c b/fs/hfsplus/xattr_trusted.c
index 0b7d78f2d4e9..bcf65089b7f7 100644
--- 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,