1 files changed, 44 insertions, 2 deletions

diff --git a/kernel/time/itimer.c b/kernel/time/itimer.c
index 087d6a1279b8..2ef98a02376a 100644
--- a/kernel/time/itimer.c
+++ b/kernel/time/itimer.c
@@ -15,6 +15,7 @@
 #include <linux/posix-timers.h>
 #include <linux/hrtimer.h>
 #include <trace/events/timer.h>
+#include <linux/compat.h>
 
 #include <linux/uaccess.h>
 
@@ -116,6 +117,19 @@ SYSCALL_DEFINE2(getitimer, int, which, struct itimerval __user *, value)
         return error;
 }
 
+#ifdef CONFIG_COMPAT
+COMPAT_SYSCALL_DEFINE2(getitimer, int, which,
+                       struct compat_itimerval __user *, it)
+{
+        struct itimerval kit;
+        int error = do_getitimer(which, &kit);
+
+        if (!error && put_compat_itimerval(it, &kit))
+                error = -EFAULT;
+        return error;
+}
+#endif
+
 
 /*
  * The timer is automagically restarted, when interval != 0
@@ -138,8 +152,12 @@ static void set_cpu_itimer(struct task_struct *tsk, unsigned int clock_id,
         u64 oval, nval, ointerval, ninterval;
         struct cpu_itimer *it = &tsk->signal->it[clock_id];
 
-        nval = timeval_to_ns(&value->it_value);
-        ninterval = timeval_to_ns(&value->it_interval);
+        /*
+         * Use the to_ktime conversion because that clamps the maximum
+         * value to KTIME_MAX and avoid multiplication overflows.
+         */
+        nval = ktime_to_ns(timeval_to_ktime(value->it_value));
+        ninterval = ktime_to_ns(timeval_to_ktime(value->it_interval));
 
         spin_lock_irq(&tsk->sighand->siglock);
 
@@ -294,3 +312,27 @@ SYSCALL_DEFINE3(setitimer, int, which, struct itimerval __user *, value,
                 return -EFAULT;
         return 0;
 }
+
+#ifdef CONFIG_COMPAT
+COMPAT_SYSCALL_DEFINE3(setitimer, int, which,
+                       struct compat_itimerval __user *, in,
+                       struct compat_itimerval __user *, out)
+{
+        struct itimerval kin, kout;
+        int error;
+
+        if (in) {
+                if (get_compat_itimerval(&kin, in))
+                        return -EFAULT;
+        } else {
+                memset(&kin, 0, sizeof(kin));
+        }
+
+        error = do_setitimer(which, &kin, out ? &kout : NULL);
+        if (error || !out)
+                return error;
+        if (put_compat_itimerval(out, &kout))
+                return -EFAULT;
+        return 0;
+}
+#endif