diff options
| author | Fabian Frederick | 2015-04-16 21:46:58 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2015-04-17 15:04:04 +0200 |
| commit | a3cef4cd6886c755d2148739699751900b51a365 (patch) | |
| tree | 49e364b4aaee42340108e3653d268f10b89529e0 /fs/hfsplus/xattr_trusted.c | |
| parent | hfsplus: add missing curly braces in hfsplus_delete_cat() (diff) | |
| download | kernel-qcow2-linux-a3cef4cd6886c755d2148739699751900b51a365.tar.gz kernel-qcow2-linux-a3cef4cd6886c755d2148739699751900b51a365.tar.xz kernel-qcow2-linux-a3cef4cd6886c755d2148739699751900b51a365.zip | |
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>
Diffstat (limited to 'fs/hfsplus/xattr_trusted.c')
| -rw-r--r-- | fs/hfsplus/xattr_trusted.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/fs/hfsplus/xattr_trusted.c b/fs/hfsplus/xattr_trusted.c index 3c5f27e4746a..0b7d78f2d4e9 100644 --- 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, |