From: Miao Xie <miaox@cn.fujitsu.com>
Date: Wed, 13 Apr 2011 06:07:59 +0000 (+0800)
Subject: Btrfs: Check validity before setting an acl
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=329c5056be8774255db04b01242a9ff4f02eb8ea;p=mv-sheeva.git

Btrfs: Check validity before setting an acl

Call posix_acl_valid() to check if an acl is valid or not.

Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 9c949348510..a892bc27f13 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -178,16 +178,17 @@ static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name,
 
 	if (value) {
 		acl = posix_acl_from_xattr(value, size);
-		if (acl == NULL) {
-			value = NULL;
-			size = 0;
+		if (acl) {
+			ret = posix_acl_valid(acl);
+			if (ret)
+				goto out;
 		} else if (IS_ERR(acl)) {
 			return PTR_ERR(acl);
 		}
 	}
 
 	ret = btrfs_set_acl(NULL, dentry->d_inode, acl, type);
-
+out:
 	posix_acl_release(acl);
 
 	return ret;