projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[cascardo/linux.git]
/
fs
/
btrfs
/
acl.c
diff --git
a/fs/btrfs/acl.c
b/fs/btrfs/acl.c
index
6ae2c8c
..
15b5ca2
100644
(file)
--- a/
fs/btrfs/acl.c
+++ b/
fs/btrfs/acl.c
@@
-60,8
+60,10
@@
static struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
size = __btrfs_getxattr(inode, name, value, size);
if (size > 0) {
acl = posix_acl_from_xattr(value, size);
- if (IS_ERR(acl))
+ if (IS_ERR(acl)) {
+ kfree(value);
return acl;
+ }
set_cached_acl(inode, type, acl);
}
kfree(value);