Home Home > GIT Browse > SLE12-SP3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-07-09 13:02:36 +0200
committerTakashi Iwai <tiwai@suse.de>2018-07-09 13:02:36 +0200
commit9b17b5a9b698c38049e4acba4cf1513df0bc23c1 (patch)
tree3b58ba7fe28e2043939f73aa7c3b4bdc17bcb1cc
parentfc2f789802e0045d5ba8adcb5060cec6a6e6a117 (diff)
parent1b7b3b1250fe8e8cec42294d71886928db04b046 (diff)
Merge cve/linux-4.4 into SLE12-SP3
-rw-r--r--kernel/time/alarmtimer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 6fcc367ad531..e78480b81f8d 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -773,7 +773,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))