summaryrefslogtreecommitdiff
path: root/fs/utimes.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-07-15 09:15:36 +0300
committerChristoph Hellwig <hch@lst.de>2020-07-31 09:16:01 +0300
commit27eb11c9632c66754ea7f67512b3516f998ed213 (patch)
tree836c6ba8be09288b97a5ddac4dd6c312e6e390ae /fs/utimes.c
parent9d4b74aee80436d067d79a6c32ebb544b0ae5460 (diff)
downloadlinux-27eb11c9632c66754ea7f67512b3516f998ed213.tar.xz
fs: move timespec validation into utimes_common
Consolidate the validation of the timespec from the two callers into utimes_common. That means it is done a little later (e.g. after the path lookup), but I can't find anything that requires a specific order of processing the errors. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/utimes.c')
-rw-r--r--fs/utimes.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/fs/utimes.c b/fs/utimes.c
index c667517b6eb1..bfd86e81c590 100644
--- a/fs/utimes.c
+++ b/fs/utimes.c
@@ -23,14 +23,19 @@ static int utimes_common(const struct path *path, struct timespec64 *times)
struct inode *inode = path->dentry->d_inode;
struct inode *delegated_inode = NULL;
+ if (times) {
+ if (!nsec_valid(times[0].tv_nsec) ||
+ !nsec_valid(times[1].tv_nsec))
+ return -EINVAL;
+ if (times[0].tv_nsec == UTIME_NOW &&
+ times[1].tv_nsec == UTIME_NOW)
+ times = NULL;
+ }
+
error = mnt_want_write(path->mnt);
if (error)
goto out;
- if (times && times[0].tv_nsec == UTIME_NOW &&
- times[1].tv_nsec == UTIME_NOW)
- times = NULL;
-
newattrs.ia_valid = ATTR_CTIME | ATTR_MTIME | ATTR_ATIME;
if (times) {
if (times[0].tv_nsec == UTIME_OMIT)
@@ -76,9 +81,6 @@ static int do_utimes_path(int dfd, const char __user *filename,
struct path path;
int lookup_flags = 0, error;
- if (times &&
- (!nsec_valid(times[0].tv_nsec) || !nsec_valid(times[1].tv_nsec)))
- return -EINVAL;
if (flags & ~(AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH))
return -EINVAL;
@@ -107,9 +109,6 @@ static int do_utimes_fd(int fd, struct timespec64 *times, int flags)
struct fd f;
int error;
- if (times &&
- (!nsec_valid(times[0].tv_nsec) || !nsec_valid(times[1].tv_nsec)))
- return -EINVAL;
if (flags)
return -EINVAL;