Messages in this thread Patch in this message | | | From | John Stultz <> | Subject | [PATCH 2/4] time: Fix casting issue in timekeeping_forward_now | Date | Tue, 21 Aug 2012 20:30:47 -0400 |
| |
From: Andreas Schwab <schwab@linux-m68k.org>
arch_gettimeoffset returns a u32 value which when shifted by tk->shift can overflow. Cast it to u64 first.
This issue was introduced with 1e75fa8be9fb61e1af46b5b3b176347a4c958ca1
Cc: Ingo Molnar <mingo@kernel.org> Cc: Prarit Bhargava <prarit@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: John Stultz <john.stultz@linaro.org> --- kernel/time/timekeeping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 258164a..1dbf80e 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -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); -- 1.7.9.5
| |