From: Thomas Gleixner Date: Mon, 5 Dec 2011 20:20:23 +0000 (+0100) Subject: alarmtimers: Fix time comparison X-Git-Tag: firefly_0821_release~7541^2~2133 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=612e5dbc550f30c787e40b958d351720e72091c6;p=firefly-linux-kernel-4.4.55.git alarmtimers: Fix time comparison commit c9c024b3f3e07d087974db4c0dc46217fff3a6c0 upstream. The expiry function compares the timer against current time and does not expire the timer when the expiry time is >= now. That's wrong. If the timer is set for now, then it must expire. Make the condition expiry > now for breaking out the loop. Signed-off-by: Thomas Gleixner Acked-by: John Stultz Signed-off-by: Greg Kroah-Hartman --- diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index ea5e1a928d5b..8b70c76910aa 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -181,7 +181,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer) struct alarm *alarm; ktime_t expired = next->expires; - if (expired.tv64 >= now.tv64) + if (expired.tv64 > now.tv64) break; alarm = container_of(next, struct alarm, node);