Skip to content

Commit f163204

Browse files
dengrafSteve Conklin
authored andcommitted
hrtimer: Fix ktime_add_ns() overflow on 32bit architectures
BugLink: http://bugs.launchpad.net/bugs/1178361 commit 51fd36f upstream. One can trigger an overflow when using ktime_add_ns() on a 32bit architecture not supporting CONFIG_KTIME_SCALAR. When passing a very high value for u64 nsec, e.g. 7881299347898368000 the do_div() function converts this value to seconds (7881299347) which is still to high to pass to the ktime_set() function as long. The result in is a negative value. The problem on my system occurs in the tick-sched.c, tick_nohz_stop_sched_tick() when time_delta is set to timekeeping_max_deferment(). The check for time_delta < KTIME_MAX is valid, thus ktime_add_ns() is called with a too large value resulting in a negative expire value. This leads to an endless loop in the ticker code: time_delta: 7881299347898368000 expires = ktime_add_ns(last_update, time_delta) expires: negative value This fix caps the value to KTIME_MAX. This error doesn't occurs on 64bit or architectures supporting CONFIG_KTIME_SCALAR (e.g. ARM, x86-32). Signed-off-by: David Engraf <[email protected]> [jstultz: Minor tweaks to commit message & header] Signed-off-by: John Stultz <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Steve Conklin <[email protected]>
1 parent 770ffaa commit f163204

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

kernel/hrtimer.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,10 @@ ktime_t ktime_sub_ns(const ktime_t kt, u64 nsec)
298298
} else {
299299
unsigned long rem = do_div(nsec, NSEC_PER_SEC);
300300

301+
/* Make sure nsec fits into long */
302+
if (unlikely(nsec > KTIME_SEC_MAX))
303+
return (ktime_t){ .tv64 = KTIME_MAX };
304+
301305
tmp = ktime_set((long)nsec, rem);
302306
}
303307

0 commit comments

Comments
 (0)