- cleanup unnecessary code
- add validity check for acl
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
---
fs/btrfs/acl.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 2f4f65a..bb35580 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -169,16 +169,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;
- } else if (IS_ERR(acl)) {
+ 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;
--
1.7.0.1
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html