diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-10-09 09:18:23 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-10-09 21:27:14 +0200 |
| commit | 5b3900cd409466c0070b234d941650685ad0c791 (patch) | |
| tree | 1a381a23d3d06cfc8941ee2e5dd400ba6cea6f21 /kernel/time | |
| parent | timers: Fix endless looping between cascade() and internal_add_timer() (diff) | |
| download | linux-5b3900cd409466c0070b234d941650685ad0c791.tar.xz linux-5b3900cd409466c0070b234d941650685ad0c791.zip | |
timekeeping: Cast raw_interval to u64 to avoid shift overflow
We fixed a bunch of integer overflows in timekeeping code during the 3.6
cycle. I did an audit based on that and found this potential overflow.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: John Stultz <johnstul@us.ibm.com>
Link: http://lkml.kernel.org/r/20121009071823.GA19159@elgon.mountain
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/timekeeping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 16280ff3cf82..3eb3fc7c1600 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1045,7 +1045,7 @@ static cycle_t logarithmic_accumulation(struct timekeeper *tk, cycle_t offset, accumulate_nsecs_to_secs(tk); /* Accumulate raw time */ - raw_nsecs = tk->raw_interval << shift; + raw_nsecs = (u64)tk->raw_interval << shift; raw_nsecs += tk->raw_time.tv_nsec; if (raw_nsecs >= NSEC_PER_SEC) { u64 raw_secs = raw_nsecs; |