linux-kernel - [tip:timers/urgent] timers: Fix overflow in get_next_timer

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-34f41c0316ed52b0b44542491d89278efdaa70e4@git.kernel.org>
Date:   Tue, 1 Aug 2017 05:25:05 -0700
From:   tip-bot for Matija Glavinic Pecotic <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     tglx@...utronix.de, hpa@...or.com,
        matija.glavinic-pecotic.ext@...ia.com,
        alexander.sverdlin@...ia.com, mingo@...nel.org,
        linux-kernel@...r.kernel.org
Subject: [tip:timers/urgent] timers: Fix overflow in
 get_next_timer_interrupt

Commit-ID:  34f41c0316ed52b0b44542491d89278efdaa70e4
Gitweb:     http://git.kernel.org/tip/34f41c0316ed52b0b44542491d89278efdaa70e4
Author:     Matija Glavinic Pecotic <matija.glavinic-pecotic.ext@...ia.com>
AuthorDate: Tue, 1 Aug 2017 09:11:52 +0200
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Tue, 1 Aug 2017 14:20:53 +0200

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: 46c8f0b077a8 ("timers: Fix get_next_timer_interrupt() computation")
Signed-off-by: Matija Glavinic Pecotic <matija.glavinic-pecotic.ext@...ia.com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Reviewed-by: Alexander Sverdlin <alexander.sverdlin@...ia.com>
Cc: khilman@...libre.com
Cc: akpm@...ux-foundation.org
Cc: stable@...r.kernel.org
Link: http://lkml.kernel.org/r/a7900f04-2a21-c9fd-67be-ab334d459ee5@nokia.com
---
 kernel/time/timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 71ce3f4..8f5d1bf 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -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:
 		 */