Btrfs: Check validity before setting an acl
authorMiao Xie <miaox@cn.fujitsu.com>
Wed, 13 Apr 2011 06:07:59 +0000 (14:07 +0800)
committerLi Zefan <lizf@cn.fujitsu.com>
Wed, 13 Apr 2011 06:25:35 +0000 (14:25 +0800)
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>
fs/btrfs/acl.c

index 9c94934..a892bc2 100644 (file)
@@ -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;