Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34f41c03 authored by Matija Glavinic Pecotic's avatar Matija Glavinic Pecotic Committed by Thomas Gleixner
Browse files

timers: Fix overflow in get_next_timer_interrupt 



For e.g. HZ=100, timer being 430 jiffies in the future, and 32 bit
unsigned int, there is an overflow on unsigned int right-hand side
of the expression which results with wrong values being returned.

Type cast the multiplier to 64bit to avoid that issue.

Fixes: 46c8f0b0 ("timers: Fix get_next_timer_interrupt() computation")
Signed-off-by: default avatarMatija Glavinic Pecotic <matija.glavinic-pecotic.ext@nokia.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarAlexander Sverdlin <alexander.sverdlin@nokia.com>
Cc: khilman@baylibre.com
Cc: akpm@linux-foundation.org
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/a7900f04-2a21-c9fd-67be-ab334d459ee5@nokia.com
parent 16f73eb0

kernel/time/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -1495,7 +1495,7 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem) 
		base->is_idle = false;

	} else {

		if (!is_max_delta)

			expires = basem + (nextevt - basej) * TICK_NSEC;

			expires = basem + (u64)(nextevt - basej) * TICK_NSEC;

		/*

		 * If we expect to sleep more than a tick, mark the base idle:

		 */