clean up utimes and use path based utimes in initrams
Hi Al and Linus,
here is the requested series to add a vfs_utimes and use that in initramfs, plus assorted cleanups that makes this easier.
fs/utimes.c | 107 ++++++++++++++++++++++++++++------------------------- include/linux/fs.h | 1 init/initramfs.c | 11 +++-- 3 files changed, 65 insertions(+), 54 deletions(-)
PATCH 1/4 fs: refactor do_utimes
Split out one helper each for path vs fd based operations.
--- fs/utimes.c | 100 ++++++++++++++++++++++++++++------------------------ 1 file changed, 54 insertions(+), 46 deletions(-)
fs/utimes.c +54 -46
@@ -70,6 +70,57 @@ static int utimes_common(const struct path *path, struct timespec64 *times)return error; } +static int do_utimes_path (int dfd,const char __user *filename, +struct timespec64 *times,int flags) +{ +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 ; + +if (!(flags &AT_SYMLINK_NOFOLLOW )) + lookup_flags |=LOOKUP_FOLLOW ; +if (flags &AT_EMPTY_PATH ) + lookup_flags |=LOOKUP_EMPTY ; + +retry: + error =user_path_at (dfd, filename, lookup_flags, &path); +if (error) +return error; + + error =utimes_common (&path, times); +path_put (&path); +if (retry_estale (error, lookup_flags)) { + lookup_flags |=LOOKUP_REVAL ; + goto retry; + } + +return error; +} + +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 ; + + f =fdget (fd); +if (!f.file) +return -EBADF ; + error =utimes_common (&f.file->f_path, times); +fdput (f); +return error; +} +/* * do_utimes - change times on filename or file descriptor * @dfd: open file descriptor, -1 or AT_FDCWD
@@ -88,52 +139,9 @@ static int utimes_common(const struct path *path, struct timespec64 *times)long do_utimes (int dfd,const char __user *filename,struct timespec64 *times,int flags) { -int error = -EINVAL ; - -if (times && (!nsec_valid (times[0 ].tv_nsec) || - !nsec_valid (times[1 ].tv_nsec))) { - goto out; - } - -if (flags & ~(AT_SYMLINK_NOFOLLOW |AT_EMPTY_PATH )) - goto out; - -if (filename ==NULL && dfd !=AT_FDCWD ) { -struct fd f; - -if (flags) - goto out; - - f =fdget (dfd); - error = -EBADF ; -if (!f.file) - goto out; - - error =utimes_common (&f.file->f_path, times); -fdput (f); - }else { -struct path path; -int lookup_flags =0 ; - -if (!(flags &AT_SYMLINK_NOFOLLOW )) - lookup_flags |=LOOKUP_FOLLOW ; -if (flags &AT_EMPTY_PATH ) - lookup_flags |=LOOKUP_EMPTY ; -retry: - error =user_path_at (dfd, filename, lookup_flags, &path); -if (error) - goto out; - - error =utimes_common (&path, times); -path_put (&path); -if (retry_estale (error, lookup_flags)) { - lookup_flags |=LOOKUP_REVAL ; - goto retry; - } - } - -out: -return error; +if (filename ==NULL && dfd !=AT_FDCWD ) +return do_utimes_fd (dfd, times, flags); +return do_utimes_path (dfd, filename, times, flags); } SYSCALL_DEFINE4(utimensat, int, dfd, const char __user *, filename,
Signature · 1 line
2.27.0
PATCH 2/4 fs: move timespec validation into utimes_common
In reply to Christoph HellwigConsolidate 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.
--- fs/utimes.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
fs/utimes.c +8 -9
@@ -27,9 +27,14 @@ static int utimes_common(const struct path *path, struct timespec64 *times)if (error) goto out; -if (times && times[0 ].tv_nsec ==UTIME_NOW && - times[1 ].tv_nsec ==UTIME_NOW ) - times =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 ; + } newattrs.ia_valid =ATTR_CTIME |ATTR_MTIME |ATTR_ATIME ;if (times) {
@@ -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 ;
Signature · 1 line
2.27.0
PATCH 3/4 fs: expose utimes_common
In reply to Christoph HellwigRename utimes_common to vfs_utimes and make it available outside of utimes.c. This will be used by the initramfs unpacking code.
--- fs/utimes.c | 6 +++--- include/linux/fs.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-)
fs/utimes.c +3 -3
@@ -16,7 +16,7 @@ static bool nsec_valid(long nsec)return nsec >=0 && nsec <=999999999 ; } -static int utimes_common (const struct path *path,struct timespec64 *times) +int vfs_utimes (const struct path *path,struct timespec64 *times) {int error;struct iattr newattrs;
@@ -94,7 +94,7 @@ static int do_utimes_path(int dfd, const char __user *filename,if (error)return error; - error =utimes_common (&path, times); + error =vfs_utimes (&path, times);path_put (&path);if (retry_estale (error, lookup_flags)) { lookup_flags |=LOOKUP_REVAL ;
@@ -115,7 +115,7 @@ static int do_utimes_fd(int fd, struct timespec64 *times, int flags) f =fdget (fd);if (!f.file)return -EBADF ; - error =utimes_common (&f.file->f_path, times); + error =vfs_utimes (&f.file->f_path, times);fdput (f);return error; }
include/linux/fs.h +1 -0
@@ -1746,6 +1746,7 @@ int vfs_mkobj(struct dentry *, umode_t,int vfs_fchown (struct file *file,uid_t user,gid_t group);int vfs_fchmod (struct file *file,umode_t mode); +int vfs_utimes (const struct path *path,struct timespec64 *times);extern long vfs_ioctl (struct file *file,unsigned int cmd,unsigned long arg);
Signature · 1 line
2.27.0
PATCH 4/4 initramfs: use vfs_utimes in do_copy
In reply to Christoph HellwigDon't bother saving away the pathname and just use the new struct path based utimes helper instead.
--- init/initramfs.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
init/initramfs.c +7 -4
@@ -201,7 +201,6 @@ static inline void __init eat(unsigned n) byte_count -= n; } -static __initdata char *vcollected;static __initdata char *collected;static long remains__initdata ;static __initdata char *collect;
@@ -342,7 +341,6 @@ static int __init do_name(void)vfs_fchmod (wfile, mode);if (body_len)vfs_truncate (&wfile->f_path, body_len); - vcollected =kstrdup (collected,GFP_KERNEL ); state = CopyFile; } }else if (S_ISDIR (mode)) {
@@ -365,11 +363,16 @@ static int __init do_name(void)static int __init do_copy (void ) {if (byte_count >= body_len) { +struct timespec64 t[2 ] = { }; +if (xwrite (wfile, victim, body_len) != body_len)error ("write error" ); + + t[0 ].tv_sec = mtime; + t[1 ].tv_sec = mtime; +vfs_utimes (&wfile->f_path, t); +fput (wfile); -do_utime (vcollected, mtime); -kfree (vcollected);eat (body_len); state = SkipIt;return 0 ;
Signature · 1 line
2.27.0
Quoted 3 lines · Christoph Hellwig
here is the requested series to add a
vfs_utimesand use that in initramfs, plus assorted cleanups that makes this easier.
Looks good to me, you can add my ack for all of them.
Linus