Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85dc8f05 authored by Andreas Schwab's avatar Andreas Schwab Committed by Thomas Gleixner
Browse files

time: Fix casting issue in timekeeping_forward_now 



arch_gettimeoffset returns a u32 value which when shifted by tk->shift
can overflow. This issue was introduced with 1e75fa8b (time: Condense
timekeeper.xtime into xtime_sec)

Cast it to u64 first.

Signed-off-by: default avatarAndreas Schwab <schwab@linux-m68k.org>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Link: http://lkml.kernel.org/r/1345595449-34965-3-git-send-email-john.stultz@linaro.org


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 784ffcbb

kernel/time/timekeeping.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static void timekeeping_forward_now(struct timekeeper *tk) 
	tk->xtime_nsec += cycle_delta * tk->mult;



	/* If arch requires, add in gettimeoffset() */

	tk->xtime_nsec += arch_gettimeoffset() << tk->shift;

	tk->xtime_nsec += (u64)arch_gettimeoffset() << tk->shift;



	tk_normalize_xtime(tk);