From: Dan Carpenter Date: Tue, 9 Oct 2012 07:18:23 +0000 (+0300) Subject: timekeeping: Cast raw_interval to u64 to avoid shift overflow X-Git-Tag: v3.7-rc1~35^2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5b3900cd409466c0070b234d941650685ad0c791;p=~emulex%2Finfiniband.git 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 Acked-by: John Stultz Link: http://lkml.kernel.org/r/20121009071823.GA19159@elgon.mountain Signed-off-by: Thomas Gleixner Cc: stable@vger.kernel.org --- diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 16280ff3cf8..3eb3fc7c160 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;