Commit ccb1fe49 authored by Greg Hackmann's avatar Greg Hackmann Committed by Greg Kroah-Hartman

alarmtimer: don't rate limit one-shot timers

Commit ff86bf0c ("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.

This patch is specific to 4.11.y and 4.12.y.  Older -stable trees have a
slightly different patch, and 4.13-rc2 isn't impacted due to a later
refactoring.

Fixes: ff86bf0c ("alarmtimer: Rate limit periodic intervals")
Reported-by: default avatarBen Fennema <fennema@google.com>
Signed-off-by: default avatarGreg Hackmann <ghackmann@google.com>
Cc: John Stultz <john.stultz@linaro.org>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2de3bd03
...@@ -665,7 +665,7 @@ static int alarm_timer_set(struct k_itimer *timr, int flags, ...@@ -665,7 +665,7 @@ 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 * Rate limit to the tick as a hot fix to prevent DOS. Will be
* mopped up later. * mopped up later.
*/ */
if (timr->it.alarm.interval < TICK_NSEC) if (timr->it.alarm.interval && timr->it.alarm.interval < TICK_NSEC)
timr->it.alarm.interval = TICK_NSEC; timr->it.alarm.interval = TICK_NSEC;
exp = timespec64_to_ktime(new_setting->it_value); exp = timespec64_to_ktime(new_setting->it_value);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment