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

Commit 67f2ffe3 authored by Dave Chinner's avatar Dave Chinner Committed by Darrick J. Wong
Browse files

xfs: don't change inode mode if ACL update fails 



If we get ENOSPC half way through setting the ACL, the inode mode
can still be changed even though the ACL does not exist. Reorder the
operation to only change the mode of the inode if the ACL is set
correctly.

Whilst this does not fix the problem with crash consistency (that requires
attribute addition to be a deferred op) it does prevent ENOSPC and other
non-fatal errors setting an xattr to be handled sanely.

This fixes xfstests generic/449.

Signed-Off-By: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent bb9c2e54

fs/xfs/xfs_acl.c

+16 −6
Original line number Original line Diff line number Diff line
@@ -247,6 +247,8 @@ xfs_set_mode(struct inode *inode, umode_t mode) 
int

int

xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type)

xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type)

{

{

	umode_t mode;

	bool set_mode = false;

	int error = 0;

	int error = 0;





	if (!acl)

	if (!acl)
@@ -257,16 +259,24 @@ xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type) 
		return error;

		return error;





	if (type == ACL_TYPE_ACCESS) {

	if (type == ACL_TYPE_ACCESS) {

		umode_t mode;



		error = posix_acl_update_mode(inode, &mode, &acl);

		error = posix_acl_update_mode(inode, &mode, &acl);

		if (error)

		if (error)

			return error;

			return error;

		error = xfs_set_mode(inode, mode);

		set_mode = true;

		if (error)

			return error;

	}

	}





 set_acl:

 set_acl:

	return __xfs_set_acl(inode, acl, type);

	error =  __xfs_set_acl(inode, acl, type);

	if (error)

		return error;



	/*

	 * We set the mode after successfully updating the ACL xattr because the

	 * xattr update can fail at ENOSPC and we don't want to change the mode

	 * if the ACL update hasn't been applied.

	 */

	if (set_mode)

		error = xfs_set_mode(inode, mode);



	return error;

}
 
}