diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-10-09 10:18:23 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-10-30 23:26:40 +0000 |
| commit | 20e6199e93250b6a6506f65c07e18fb18ad382ab (patch) | |
| tree | 2b140485aedb2074d69306b359aac22cc8b48f75 /kernel/time | |
| parent | a3c51b174d95aa3bce6845d03719928ab02289f6 (diff) | |
| download | kernel_samsung_smdk4412-20e6199e93250b6a6506f65c07e18fb18ad382ab.zip kernel_samsung_smdk4412-20e6199e93250b6a6506f65c07e18fb18ad382ab.tar.gz kernel_samsung_smdk4412-20e6199e93250b6a6506f65c07e18fb18ad382ab.tar.bz2 | |
timekeeping: Cast raw_interval to u64 to avoid shift overflow
commit 5b3900cd409466c0070b234d941650685ad0c791 upstream.
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>
[bwh: Backported to 3.2: adjust context; use timekeeper.raw_interval]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
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 5ee1ac0..cb7f33e 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -992,7 +992,7 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift) } /* Accumulate raw time */ - raw_nsecs = timekeeper.raw_interval << shift; + raw_nsecs = (u64)timekeeper.raw_interval << shift; raw_nsecs += raw_time.tv_nsec; if (raw_nsecs >= NSEC_PER_SEC) { u64 raw_secs = raw_nsecs; |