posix-cpu-timers: Sanitize bogus WARNONS

[mirror_ubuntu-bionic-kernel.git] / kernel / time / posix-cpu-timers.c

diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 1f27887aa19487e82950498485bc83a295098104..dfde8d22b204fc97e3333e4e15701e02994148cc 100644 (file)
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -84,7 +84,7 @@ static void bump_cpu_timer(struct k_itimer *timer, u64 now)
                        continue;
 
                timer->it.cpu.expires += incr;
-               timer->it_overrun += 1 << i;
+               timer->it_overrun += 1LL << i;
                delta -= incr;
        }
 }
@@ -374,7 +374,8 @@ static int posix_cpu_timer_del(struct k_itimer *timer)
        struct sighand_struct *sighand;
        struct task_struct *p = timer->it.cpu.task;
 
-       WARN_ON_ONCE(p == NULL);
+       if (WARN_ON_ONCE(!p))
+               return -EINVAL;
 
        /*
         * Protect against sighand release/switch in exit/exec and process/
@@ -579,7 +580,8 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags,
        u64 old_expires, new_expires, old_incr, val;
        int ret;
 
-       WARN_ON_ONCE(p == NULL);
+       if (WARN_ON_ONCE(!p))
+               return -EINVAL;
 
        /*
         * Use the to_ktime conversion because that clamps the maximum
@@ -685,6 +687,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags,
         * set up the signal and overrun bookkeeping.
         */
        timer->it.cpu.incr = timespec64_to_ns(&new->it_interval);
+       timer->it_interval = ns_to_ktime(timer->it.cpu.incr);
 
        /*
         * This acts as a modification timestamp for the timer,
@@ -715,10 +718,11 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags,
 
 static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec64 *itp)
 {
-       u64 now;
        struct task_struct *p = timer->it.cpu.task;
+       u64 now;
 
-       WARN_ON_ONCE(p == NULL);
+       if (WARN_ON_ONCE(!p))
+               return;
 
        /*
         * Easy part: convert the reload time.
@@ -989,12 +993,13 @@ static void check_process_timers(struct task_struct *tsk,
  */
 static void posix_cpu_timer_rearm(struct k_itimer *timer)
 {
+       struct task_struct *p = timer->it.cpu.task;
        struct sighand_struct *sighand;
        unsigned long flags;
-       struct task_struct *p = timer->it.cpu.task;
        u64 now;
 
-       WARN_ON_ONCE(p == NULL);
+       if (WARN_ON_ONCE(!p))
+               return;
 
        /*
         * Fetch the current sample and update the timer's expiry time.
@@ -1188,7 +1193,9 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clock_idx,
 {
        u64 now;
 
-       WARN_ON_ONCE(clock_idx == CPUCLOCK_SCHED);
+       if (WARN_ON_ONCE(clock_idx >= CPUCLOCK_SCHED))
+               return;
+
        cpu_timer_sample_group(clock_idx, tsk, &now);
 
        if (oldval) {