diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2008-07-01 15:01:26 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-07-26 20:53:25 -0400 |
| commit | 9767d74957450da6365c363d69e3d02d605d7375 (patch) | |
| tree | 913afe491d13b42b0cfcb540569080bba4725dfd /fs/attr.c | |
| parent | 88b387824fdaecb6ba0f471acf0aadf7d24739fd (diff) | |
| download | linux-3.10-9767d74957450da6365c363d69e3d02d605d7375.tar.gz linux-3.10-9767d74957450da6365c363d69e3d02d605d7375.tar.bz2 linux-3.10-9767d74957450da6365c363d69e3d02d605d7375.zip | |
[patch 1/4] vfs: utimes: move owner check into inode_change_ok()
Add a new ia_valid flag: ATTR_TIMES_SET, to handle the
UTIMES_OMIT/UTIMES_NOW and UTIMES_NOW/UTIMES_OMIT cases. In these
cases neither ATTR_MTIME_SET nor ATTR_ATIME_SET is in the flags, yet
the POSIX draft specifies that permission checking is performed the
same way as if one or both of the times was explicitly set to a
timestamp.
See the path "vfs: utimensat(): fix error checking for
{UTIME_NOW,UTIME_OMIT} case" by Michael Kerrisk for the patch
introducing this behavior.
This is a cleanup, as well as allowing filesystems (NFS/fuse/...) to
perform their own permission checking instead of the default.
CC: Ulrich Drepper <drepper@redhat.com>
CC: Michael Kerrisk <mtk.manpages@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/attr.c')
| -rw-r--r-- | fs/attr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/attr.c b/fs/attr.c index 966b73e25f8..765fc75fab3 100644 --- a/fs/attr.c +++ b/fs/attr.c @@ -51,7 +51,7 @@ int inode_change_ok(struct inode *inode, struct iattr *attr) } /* Check for setting the inode time. */ - if (ia_valid & (ATTR_MTIME_SET | ATTR_ATIME_SET)) { + if (ia_valid & (ATTR_MTIME_SET | ATTR_ATIME_SET | ATTR_TIMES_SET)) { if (!is_owner_or_cap(inode)) goto error; } |