alarmtimer: don't rate limit one-shot timers

Commit ff86bf0 ("alarmtimer: Rate limit periodic intervals") sets a minimum bound on the alarm timer interval. This minimum bound shouldn't be applied if the interval is 0. Otherwise, one-shot timers will be converted into periodic ones. Fixes: ff86bf0 ("alarmtimer: Rate limit periodic intervals") Reported-by: Ben Fennema <[email protected]> Signed-off-by: Greg Hackmann <[email protected]> Cc: [email protected] Cc: John Stultz <[email protected]> Reviewed-by: Thomas Gleixner <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
FFY00 · Sep 22, 2017 · 5d3df86 · 5d3df86
1 parent 72f4e4c
commit 5d3df86
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
@@ -855,7 +855,8 @@ static int alarm_timer_set(struct k_itimer *timr, int flags,
  * Rate limit to the tick as a hot fix to prevent DOS. Will be
  * mopped up later.
  */
- if (ktime_to_ns(timr->it.alarm.interval) < TICK_NSEC)
+ if (timr->it.alarm.interval.tv64 &&
+ ktime_to_ns(timr->it.alarm.interval) < TICK_NSEC)
  timr->it.alarm.interval = ktime_set(0, TICK_NSEC);
 
  exp = timespec_to_ktime(new_setting->it_value);