* If the allocation failed, don't free to free it, even though kfree
allows to free a NULL pointer.
* If posix_acl_to_xattr() failed, cleanup the allocation and return
the error directly.
Signed-off-by: Sheng Yong <shengyong1@xxxxxxxxxx>
---
fs/btrfs/acl.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 9a0124a..6d01d09 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -103,18 +103,18 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans,
if (acl) {
size = posix_acl_xattr_size(acl->a_count);
value = kmalloc(size, GFP_NOFS);
- if (!value) {
- ret = -ENOMEM;
- goto out;
- }
+ if (!value)
+ return -ENOMEM;
ret = posix_acl_to_xattr(&init_user_ns, acl, value, size);
- if (ret < 0)
- goto out;
+ if (ret < 0) {
+ kfree(value);
+ return ret;
+ }
}
ret = __btrfs_setxattr(trans, inode, name, value, size, 0);
-out:
+
kfree(value);
if (!ret)
--
1.8.3.4
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
