fs: return EPERM on immutable inode

guaneryu · torvalds · commit 337684a1746f · 2016-08-07T10:03:31.000-04:00
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 &lt;dchinner@redhat.com&gt;
Signed-off-by: Eryu Guan &lt;guaneryu@gmail.com&gt;
Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git 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
@@ -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
@@ -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
@@ -232,7 +232,7 @@ xfs_open_by_handle(
 	}
 
 	if ((fmode & FMODE_WRITE) && IS_IMMUTABLE(inode)) {
-		error = -EACCES;
+		error = -EPERM;
 		goto out_dput;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1800,7 +1800,7 @@ int gfs2_permission(struct inode *inode, int mask)`
`1800`	`1800`	`}`
`1801`	`1801`
`1802`	`1802`	`if ((mask & MAY_WRITE) && IS_IMMUTABLE(inode))`
`1803`		`- error = -EACCES;`
	`1803`	`+ error = -EPERM;`
`1804`	`1804`	`else`
`1805`	`1805`	`error = generic_permission(inode, mask);`
`1806`	`1806`	`if (gfs2_holder_initialized(&i_gh))`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ xfs_open_by_handle(`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`if ((fmode & FMODE_WRITE) && IS_IMMUTABLE(inode)) {`
`235`		`- error = -EACCES;`
	`235`	`+ error = -EPERM;`
`236`	`236`	`goto out_dput;`
`237`	`237`	`}`
`238`	`238`