Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
  • Loading branch information...
commit 5b3900cd409466c0070b234d941650685ad0c791 1 parent 26cff4e
authored October 09, 2012 Thomas Gleixner committed October 09, 2012

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

  1. 2  kernel/time/timekeeping.c
2  kernel/time/timekeeping.c
@@ -1045,7 +1045,7 @@ static cycle_t logarithmic_accumulation(struct timekeeper *tk, cycle_t offset,
1045 1045
 	accumulate_nsecs_to_secs(tk);
1046 1046
 
1047 1047
 	/* Accumulate raw time */
1048  
-	raw_nsecs = tk->raw_interval << shift;
  1048
+	raw_nsecs = (u64)tk->raw_interval << shift;
1049 1049
 	raw_nsecs += tk->raw_time.tv_nsec;
1050 1050
 	if (raw_nsecs >= NSEC_PER_SEC) {
1051 1051
 		u64 raw_secs = raw_nsecs;

0 notes on commit 5b3900c

Please sign in to comment.
Something went wrong with that request. Please try again.