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

Commit a9cc71a6 authored by Chris Mason's avatar Chris Mason
Browse files

Btrfs: deal with NULL acl sent to btrfs_set_acl



It is legal for btrfs_set_acl to be sent a NULL acl.  This
makes sure we don't dereference it.  A similar patch was sent by
Johannes Hirte <johannes.hirte@fem.tu-ilmenau.de>

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 6c090a11
Loading
Loading
Loading
Loading
+7 −5
Original line number Diff line number Diff line
@@ -112,12 +112,14 @@ static int btrfs_set_acl(struct btrfs_trans_handle *trans,
	switch (type) {
	case ACL_TYPE_ACCESS:
		mode = inode->i_mode;
		name = POSIX_ACL_XATTR_ACCESS;
		if (acl) {
			ret = posix_acl_equiv_mode(acl, &mode);
			if (ret < 0)
				return ret;
		ret = 0;
			inode->i_mode = mode;
		name = POSIX_ACL_XATTR_ACCESS;
		}
		ret = 0;
		break;
	case ACL_TYPE_DEFAULT:
		if (!S_ISDIR(inode->i_mode))