Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 834e7475 authored by Dan Carpenter's avatar Dan Carpenter Committed by Chris Mason
Browse files

Btrfs: handle ERR_PTR from posix_acl_from_xattr() 



posix_acl_from_xattr() returns both ERR_PTRs and null, but it's OK to
pass null values to set_cached_acl()

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 15e70000

fs/btrfs/acl.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -60,6 +60,8 @@ static struct posix_acl *btrfs_get_acl(struct inode *inode, int type) 
		size = __btrfs_getxattr(inode, name, value, size);

		size = __btrfs_getxattr(inode, name, value, size);

		if (size > 0) {

		if (size > 0) {

			acl = posix_acl_from_xattr(value, size);

			acl = posix_acl_from_xattr(value, size);

			if (IS_ERR(acl))

				return acl;

			set_cached_acl(inode, type, acl);

			set_cached_acl(inode, type, acl);

		}

		}

		kfree(value);

		kfree(value);