1 files changed, 12 insertions, 2 deletions

diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
index 7876a0226285..692e46a6b8da 100644
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@@ -775,15 +775,25 @@ asmlinkage long sys32_settimeofday(struct compat_timeval __user *tv,
 asmlinkage long sys32_utimes(char __user *filename,
                              struct compat_timeval __user *tvs)
 {
-        struct timeval ktvs[2];
+        struct timespec tv[2];
 
         if (tvs) {
+                struct timeval ktvs[2];
                 if (get_tv32(&ktvs[0], tvs) ||
                     get_tv32(&ktvs[1], 1+tvs))
                         return -EFAULT;
+
+                if (ktvs[0].tv_usec < 0 || ktvs[0].tv_usec >= 1000000 ||
+                    ktvs[1].tv_usec < 0 || ktvs[1].tv_usec >= 1000000)
+                        return -EINVAL;
+
+                tv[0].tv_sec = ktvs[0].tv_sec;
+                tv[0].tv_nsec = 1000 * ktvs[0].tv_usec;
+                tv[1].tv_sec = ktvs[1].tv_sec;
+                tv[1].tv_nsec = 1000 * ktvs[1].tv_usec;
         }
 
-        return do_utimes(AT_FDCWD, filename, (tvs ? &ktvs[0] : NULL));
+        return do_utimes(AT_FDCWD, filename, tvs ? tv : NULL);
 }
 
 /* These are here just in case some old sparc32 binary calls it. */