alarmtimer: Prevent overflow for relative nanosleep

commit 5f936e19cc0ef97dbe3a56e9498922ad5ba1edef upstream.

Air Icy reported:

  UBSAN: Undefined behaviour in kernel/time/alarmtimer.c:811:7
  signed integer overflow:
  1529859276030040771 + 9223372036854775807 cannot be represented in type 'long long int'
  Call Trace:
   alarm_timer_nsleep+0x44c/0x510 kernel/time/alarmtimer.c:811
   __do_sys_clock_nanosleep kernel/time/posix-timers.c:1235 [inline]
   __se_sys_clock_nanosleep kernel/time/posix-timers.c:1213 [inline]
   __x64_sys_clock_nanosleep+0x326/0x4e0 kernel/time/posix-timers.c:1213
   do_syscall_64+0xb8/0x3a0 arch/x86/entry/common.c:290

alarm_timer_nsleep() uses ktime_add() to add the current time and the
relative expiry value. ktime_add() has no sanity checks so the addition
can overflow when the relative timeout is large enough.

Use ktime_add_safe() which has the necessary sanity checks in place and
limits the result to the valid range.

Fixes: 9a7adcf5c6 ("timers: Posix interface for alarm-timers")
Reported-by: Team OWL337 <icytxw@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: John Stultz <john.stultz@linaro.org>
Link: https://lkml.kernel.org/r/alpine.DEB.2.21.1807020926360.1595@nanos.tec.linutronix.de
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Change-Id: I00ed8e38ea6298a086849e2fc9fee46f3e6bd5d1
CVE-2018-13053
Signed-off-by: Kevin F. Haggerty <haggertk@lineageos.org>

This commit is contained in:

Thomas Gleixner

2018-07-02 09:34:29 +02:00

committed by

Francescodario Cuzzocrea

parent 23d5487e8c

commit 20f62cf9ff

1 changed files with 2 additions and 1 deletions

									
										3

kernel/time/alarmtimer.c

										View File
									
				@ -799,7 +799,8 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags,

					/* Convert (if necessary) to absolute time */

					if (flags != TIMER_ABSTIME) {

						ktime_t now = alarm_bases[type].gettime();

						exp = ktime_add(now, exp);

						exp = ktime_add_safe(now, exp);

					}

					if (alarmtimer_do_nsleep(&alarm, exp))

alarmtimer: Prevent overflow for relative nanosleep

3 kernel/time/alarmtimer.c Unescape Escape View File

3

kernel/time/alarmtimer.c

View File