Skip to content

Commit

Permalink
Btrfs: Check validity before setting an acl
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Miao Xie authored and Li Zefan committed Apr 13, 2011
1 parent 3153495 commit 329c505
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions fs/btrfs/acl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 329c505

Please sign in to comment.