diff mbox

[v2,RESEND] fs: return EPERM on immutable inode

Message ID 1470139108-13115-1-git-send-email-guaneryu@gmail.com (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Eryu Guan Aug. 2, 2016, 11:58 a.m. UTC 
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>
---
v2:
- update commit log to mention that it's found by running LTP

 fs/gfs2/inode.c    | 2 +-
 fs/namei.c         | 2 +-
 fs/utimes.c        | 3 ++-
 fs/xfs/xfs_ioctl.c | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

Comments

Christoph Hellwig Aug. 2, 2016, 12:28 p.m. UTC | #1 
On Tue, Aug 02, 2016 at 07:58:28PM +0800, Eryu Guan wrote:
> 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.

Looks fine,

Reviewed-by: Christoph Hellwig <hch@lst.de>

Although maybe you'll have to split this into one patch per subsystems,
as otherwise no maintainer might be enticed to pick it up.
Al Viro Aug. 3, 2016, 5:37 p.m. UTC | #2 
On Tue, Aug 02, 2016 at 07:58:28PM +0800, Eryu Guan wrote:
> 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>

Applied.
diff mbox

Patch

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index e0621ca..e4da0ec 100644
--- 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 c386a32..adb0414 100644
--- 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 85c40f4..794f5f5 100644
--- 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 9a7c878..3d6820f 100644
--- 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;
 	}