---

yaml --- r: 231760 b: refs/heads/master c: 42838bb h: refs/heads/master v: v3
git-mirror · Jan 16, 2011 · e687222 · e687222
1 parent b3dcd13
commit e687222
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d07bcec969af335d4e35b3921131b7929bd634e
+refs/heads/master: 42838bb265b9cff3de9587fcacc398b5112dc2d9
diff --git a/trunk/fs/btrfs/acl.c b/trunk/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);