summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorMiao Xie <miaox@cn.fujitsu.com>2011-04-13 08:07:59 +0200
committerLi Zefan <lizf@cn.fujitsu.com>2011-04-13 08:25:35 +0200
commit329c5056be8774255db04b01242a9ff4f02eb8ea (patch)
treea0aa0ebeb00644833b54df6274058c5a2aa8b7c4 /fs/btrfs
parentBtrfs: Fix incorrect inode nlink in btrfs_link() (diff)
downloadlinux-329c5056be8774255db04b01242a9ff4f02eb8ea.tar.xz
linux-329c5056be8774255db04b01242a9ff4f02eb8ea.zip
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>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/acl.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 9c949348510b..a892bc27f13a 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;