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: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index e0621cacf13483807a8169d75aea74a6c103afd8..e4da0ecd32852bb95d5bb3db8ae9cc71991f40f2 100644 (file)
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -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))

diff --git a/fs/namei.c b/fs/namei.c
index c386a329ab203d44bc9a1ee5c49d5681a32fd81d..adb04146df09281ff5825382c0f73564024061b9 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -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

diff --git a/fs/utimes.c b/fs/utimes.c
index 85c40f4f373d56b3d5d41ed2fe7459759c8a3aeb..794f5f5b1fb5cfd636725bfd65a7d21df916c36e 100644 (file)
--- a/fs/utimes.c
+++ b/fs/utimes.c
@@ -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)

diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index cf46658392ceadebc09b35ccf4dd5f7b4db8ddb5..96a70fd1f5d6735b514f008bd165cf032bf7fd86 100644 (file)
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -232,7 +232,7 @@ xfs_open_by_handle(
        }
 
        if ((fmode & FMODE_WRITE) && IS_IMMUTABLE(inode)) {
-               error = -EACCES;
+               error = -EPERM;
                goto out_dput;
        }