Skip to content

Commit 9c839d0

Browse files
greghackmanngregkh
authored andcommitted
alarmtimer: don't rate limit one-shot timers
Commit ff86bf0c65f1 ("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: ff86bf0c65f1 ("alarmtimer: Rate limit periodic intervals") Reported-by: Ben Fennema <fennema@google.com> Signed-off-by: Greg Hackmann <ghackmann@google.com> Cc: stable@vger.kernel.org Cc: John Stultz <john.stultz@linaro.org> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent bb8109a commit 9c839d0

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

kernel/time/alarmtimer.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,8 @@ static int alarm_timer_set(struct k_itimer *timr, int flags,
616616
* Rate limit to the tick as a hot fix to prevent DOS. Will be
617617
* mopped up later.
618618
*/
619-
if (ktime_to_ns(timr->it.alarm.interval) < TICK_NSEC)
619+
if (timr->it.alarm.interval.tv64 &&
620+
ktime_to_ns(timr->it.alarm.interval) < TICK_NSEC)
620621
timr->it.alarm.interval = ktime_set(0, TICK_NSEC);
621622

622623
exp = timespec_to_ktime(new_setting->it_value);

0 commit comments

Comments
 (0)