Commit 5b3900cd authored Oct 09, 2012 by Dan Carpenter Committed by Thomas Gleixner Oct 09, 2012

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

parent 26cff4e2

kernel/time/timekeeping.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1045,7 +1045,7 @@ static cycle_t logarithmic_accumulation(struct timekeeper *tk, cycle_t offset,
	accumulate_nsecs_to_secs(tk);		accumulate_nsecs_to_secs(tk);

	/* Accumulate raw time */		/* Accumulate raw time */
	raw_nsecs = tk->raw_interval << shift;		raw_nsecs = (u64)tk->raw_interval << shift;
	raw_nsecs += tk->raw_time.tv_nsec;		raw_nsecs += tk->raw_time.tv_nsec;
	if (raw_nsecs >= NSEC_PER_SEC) {		if (raw_nsecs >= NSEC_PER_SEC) {
	u64 raw_secs = raw_nsecs;		u64 raw_secs = raw_nsecs;