1 files changed, 35 insertions, 8 deletions

diff --git a/fs/compat.c b/fs/compat.c
index 9f6248dfd9d9..9cf75df9b2bb 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -77,30 +77,57 @@ int compat_printk(const char *fmt, ...)
  */
 asmlinkage long compat_sys_utime(char __user *filename, struct compat_utimbuf __user *t)
 {
-        struct timeval tv[2];
+        struct timespec tv[2];
 
         if (t) {
                 if (get_user(tv[0].tv_sec, &t->actime) ||
                     get_user(tv[1].tv_sec, &t->modtime))
                         return -EFAULT;
-                tv[0].tv_usec = 0;
-                tv[1].tv_usec = 0;
+                tv[0].tv_nsec = 0;
+                tv[1].tv_nsec = 0;
         }
-        return do_utimes(AT_FDCWD, filename, t ? tv : NULL);
+        return do_utimes(AT_FDCWD, filename, t ? tv : NULL, 0);
+}
+
+asmlinkage long compat_sys_utimensat(unsigned int dfd, char __user *filename, struct compat_timespec __user *t, int flags)
+{
+        struct timespec tv[2];
+
+        if  (t) {
+                if (get_compat_timespec(&tv[0], &t[0]) ||
+                    get_compat_timespec(&tv[1], &t[1]))
+                        return -EFAULT;
+
+                if ((tv[0].tv_nsec == UTIME_OMIT || tv[0].tv_nsec == UTIME_NOW)
+                    && tv[0].tv_sec != 0)
+                        return -EINVAL;
+                if ((tv[1].tv_nsec == UTIME_OMIT || tv[1].tv_nsec == UTIME_NOW)
+                    && tv[1].tv_sec != 0)
+                        return -EINVAL;
+
+                if (tv[0].tv_nsec == UTIME_OMIT && tv[1].tv_nsec == UTIME_OMIT)
+                        return 0;
+        }
+        return do_utimes(dfd, filename, t ? tv : NULL, flags);
 }
 
 asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *filename, struct compat_timeval __user *t)
 {
-        struct timeval tv[2];
+        struct timespec tv[2];
 
         if (t) {
                 if (get_user(tv[0].tv_sec, &t[0].tv_sec) ||
-                    get_user(tv[0].tv_usec, &t[0].tv_usec) ||
+                    get_user(tv[0].tv_nsec, &t[0].tv_usec) ||
                     get_user(tv[1].tv_sec, &t[1].tv_sec) ||
-                    get_user(tv[1].tv_usec, &t[1].tv_usec))
+                    get_user(tv[1].tv_nsec, &t[1].tv_usec))
                         return -EFAULT;
+                if (tv[0].tv_nsec >= 1000000 || tv[0].tv_nsec < 0 ||
+                    tv[1].tv_nsec >= 1000000 || tv[1].tv_nsec < 0)
+                        return -EINVAL;
+                tv[0].tv_nsec *= 1000;
+                tv[1].tv_nsec *= 1000;
         }
-        return do_utimes(dfd, filename, t ? tv : NULL);
+        return do_utimes(dfd, filename, t ? tv : NULL, 0);
 }
 
 asmlinkage long compat_sys_utimes(char __user *filename, struct compat_timeval __user *t)