Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1371573 > unrolled thread
| Started by | Eryu Guan <guaneryu@gmail.com> |
|---|---|
| First post | 2016-04-05 15:40 +0200 |
| Last post | 2016-04-06 05:50 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] fs: return EPERM on immutable inode Eryu Guan <guaneryu@gmail.com> - 2016-04-05 15:40 +0200
Re: [PATCH] fs: return EPERM on immutable inode Dave Chinner <david@fromorbit.com> - 2016-04-05 22:50 +0200
[PATCH v2] fs: return EPERM on immutable inode Eryu Guan <guaneryu@gmail.com> - 2016-04-06 05:50 +0200
| From | Eryu Guan <guaneryu@gmail.com> |
|---|---|
| Date | 2016-04-05 15:40 +0200 |
| Subject | [PATCH] fs: return EPERM on immutable inode |
| Message-ID | <rkzn4-4jC-7@gated-at.bofh.it> |
In most cases, EPERM is returned on immutable inode, and there're only
a few places returning EACCES. And EPERM looks more reasonable to me.
So converting all EACCES to EPERM on immutable inode.
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
---
I noticed this when running LTP on overlayfs, setxattr03 failed due to
unexpected EACCES on immutable inode.
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(-)
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index bb30f9a..4c68d91 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -1757,7 +1757,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 (unlock)
diff --git a/fs/namei.c b/fs/namei.c
index 1d9ca2d..7f4a40a 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -408,7 +408,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;
}
retval = do_inode_permission(inode, mask);
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 bcb6c19..4c4c58f 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;
}
--
2.5.5
[toc] | [next] | [standalone]
| From | Dave Chinner <david@fromorbit.com> |
|---|---|
| Date | 2016-04-05 22:50 +0200 |
| Message-ID | <rkG5c-1el-5@gated-at.bofh.it> |
| In reply to | #1371573 |
On Tue, Apr 05, 2016 at 09:28:10PM +0800, Eryu Guan wrote: > In most cases, EPERM is returned on immutable inode, and there're only > a few places returning EACCES. And EPERM looks more reasonable to me. > > So converting all EACCES to EPERM on immutable inode. > > Signed-off-by: Eryu Guan <guaneryu@gmail.com> > --- > > I noticed this when running LTP on overlayfs, setxattr03 failed due to > unexpected EACCES on immutable inode. This should be in the commit message itself, rather than "EPERM looks more reasonable". Other than that, change seems fine to me. Acked-by: Dave Chinner <dchinner@redhat.com> -- Dave Chinner david@fromorbit.com
[toc] | [prev] | [next] | [standalone]
| From | Eryu Guan <guaneryu@gmail.com> |
|---|---|
| Date | 2016-04-06 05:50 +0200 |
| Subject | [PATCH v2] fs: return EPERM on immutable inode |
| Message-ID | <rkMDE-6d0-1@gated-at.bofh.it> |
| In reply to | #1371573 |
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 message to include the background on noticing this issue
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(-)
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index bb30f9a..4c68d91 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -1757,7 +1757,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 (unlock)
diff --git a/fs/namei.c b/fs/namei.c
index 1d9ca2d..7f4a40a 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -408,7 +408,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;
}
retval = do_inode_permission(inode, mask);
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 bcb6c19..4c4c58f 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;
}
--
2.5.5
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web