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

Commit 337684a1 authored by Eryu Guan's avatar Eryu Guan Committed by Linus Torvalds
Browse files

fs: return EPERM on immutable inode 



In most cases, EPERM is returned on immutable inode, and there're only a
few places returning EACCES. I noticed this when running LTP on
overlayfs, setxattr03 failed due to unexpected EACCES on immutable
inode.

So converting all EACCES to EPERM on immutable inode.

Acked-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarEryu Guan <guaneryu@gmail.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fe64f328

fs/gfs2/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1800,7 +1800,7 @@ int gfs2_permission(struct inode *inode, int mask) 
	}



	if ((mask & MAY_WRITE) && IS_IMMUTABLE(inode))

		error = -EACCES;

		error = -EPERM;

	else

		error = generic_permission(inode, mask);

	if (gfs2_holder_initialized(&i_gh))

fs/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ int __inode_permission(struct inode *inode, int mask) 
		 * Nobody gets write access to an immutable file.

		 */

		if (IS_IMMUTABLE(inode))

			return -EACCES;

			return -EPERM;



		/*

		 * Updating mtime will likely cause i_uid and i_gid to be

fs/utimes.c

+2 −1
Original line number Diff line number Diff line
@@ -92,10 +92,11 @@ static int utimes_common(struct path *path, struct timespec *times) 
		 * then we need to check permissions, because

		 * inode_change_ok() won't do it.

		 */

		error = -EACCES;

		error = -EPERM;

                if (IS_IMMUTABLE(inode))

			goto mnt_drop_write_and_out;



		error = -EACCES;

		if (!inode_owner_or_capable(inode)) {

			error = inode_permission(inode, MAY_WRITE);

			if (error)

fs/xfs/xfs_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ xfs_open_by_handle( 
	}



	if ((fmode & FMODE_WRITE) && IS_IMMUTABLE(inode)) {

		error = -EACCES;

		error = -EPERM;

		goto out_dput;

	}