3 files changed, 14 insertions, 13 deletions

diff --git a/fs/utimes.c b/fs/utimes.c
index 6571d8c848a0..51edb9f9507c 100644
--- a/fs/utimes.c
+++ b/fs/utimes.c
@@ -22,7 +22,7 @@
  */
 SYSCALL_DEFINE2(utime, char __user *, filename, struct utimbuf __user *, times)
 {
-        struct timespec tv[2];
+        struct timespec64 tv[2];
 
         if (times) {
                 if (get_user(tv[0].tv_sec, &times->actime) ||
@@ -44,7 +44,7 @@ static bool nsec_valid(long nsec)
         return nsec >= 0 && nsec <= 999999999;
 }
 
-static int utimes_common(const struct path *path, struct timespec *times)
+static int utimes_common(const struct path *path, struct timespec64 *times)
 {
         int error;
         struct iattr newattrs;
@@ -115,7 +115,7 @@ out:
  * must be owner or have write permission.
  * Else, update from *times, must be owner or super user.
  */
-long do_utimes(int dfd, const char __user *filename, struct timespec *times,
+long do_utimes(int dfd, const char __user *filename, struct timespec64 *times,
                int flags)
 {
         int error = -EINVAL;
@@ -167,10 +167,11 @@ out:
 SYSCALL_DEFINE4(utimensat, int, dfd, const char __user *, filename,
                 struct timespec __user *, utimes, int, flags)
 {
-        struct timespec tstimes[2];
+        struct timespec64 tstimes[2];
 
         if (utimes) {
-                if (copy_from_user(&tstimes, utimes, sizeof(tstimes)))
+                if ((get_timespec64(&tstimes[0], &utimes[0]) ||
+                        get_timespec64(&tstimes[1], &utimes[1])))
                         return -EFAULT;
 
                 /* Nothing to do, we must not even check the path.  */
@@ -186,7 +187,7 @@ SYSCALL_DEFINE3(futimesat, int, dfd, const char __user *, filename,
                 struct timeval __user *, utimes)
 {
         struct timeval times[2];
-        struct timespec tstimes[2];
+        struct timespec64 tstimes[2];
 
         if (utimes) {
                 if (copy_from_user(&times, utimes, sizeof(times)))
@@ -224,7 +225,7 @@ SYSCALL_DEFINE2(utimes, char __user *, filename,
 COMPAT_SYSCALL_DEFINE2(utime, const char __user *, filename,
                        struct compat_utimbuf __user *, t)
 {
-        struct timespec tv[2];
+        struct timespec64 tv[2];
 
         if (t) {
                 if (get_user(tv[0].tv_sec, &t->actime) ||
@@ -238,11 +239,11 @@ COMPAT_SYSCALL_DEFINE2(utime, const char __user *, filename,
 
 COMPAT_SYSCALL_DEFINE4(utimensat, unsigned int, dfd, const char __user *, filename, struct compat_timespec __user *, t, int, flags)
 {
-        struct timespec tv[2];
+        struct timespec64 tv[2];
 
         if  (t) {
-                if (compat_get_timespec(&tv[0], &t[0]) ||
-                    compat_get_timespec(&tv[1], &t[1]))
+                if (compat_get_timespec64(&tv[0], &t[0]) ||
+                    compat_get_timespec64(&tv[1], &t[1]))
                         return -EFAULT;
 
                 if (tv[0].tv_nsec == UTIME_OMIT && tv[1].tv_nsec == UTIME_OMIT)
@@ -253,7 +254,7 @@ COMPAT_SYSCALL_DEFINE4(utimensat, unsigned int, dfd, const char __user *, filena
 
 COMPAT_SYSCALL_DEFINE3(futimesat, unsigned int, dfd, const char __user *, filename, struct compat_timeval __user *, t)
 {
-        struct timespec tv[2];
+        struct timespec64 tv[2];
 
         if (t) {
                 if (get_user(tv[0].tv_sec, &t[0].tv_sec) ||
diff --git a/include/linux/time.h b/include/linux/time.h
index 4abb32d4c6b8..3d0cd017f0d7 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -178,7 +178,7 @@ extern int do_setitimer(int which, struct itimerval *value,
                         struct itimerval *ovalue);
 extern int do_getitimer(int which, struct itimerval *value);
 
-extern long do_utimes(int dfd, const char __user *filename, struct timespec *times, int flags);
+extern long do_utimes(int dfd, const char __user *filename, struct timespec64 *times, int flags);
 
 /*
  * Similar to the struct tm in userspace <time.h>, but it needs to be here so
diff --git a/init/initramfs.c b/init/initramfs.c
index 8a532050043f..e64bf7b4c1ca 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -110,7 +110,7 @@ static void __init free_hash(void)
 
 static long __init do_utime(char *filename, time_t mtime)
 {
-        struct timespec t[2];
+        struct timespec64 t[2];
 
         t[0].tv_sec = mtime;
         t[0].tv_nsec = 0;