Commit 711b4133 authored Jul 24, 2017 by Greg Hackmann Committed by Greg Kroah-Hartman Jul 27, 2017

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>

parent d40d5121

kernel/time/alarmtimer.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -619,7 +619,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);