hangcheck-timer: cleanup casting in hangcheck_init()

PATCH New Dan Carpenter 1 participant 1 message Oct 29, 2014

Subsystems (2)

Kernel janitors Char and misc drivers

lore

Share & tools

lore

Dan Carpenter

author

2014-10-29 08:42 UTC #0 lore raw

PATCH 1/1 hangcheck-timer: cleanup casting in hangcheck_init()

The 32 bit addition "(hangcheck_margin + hangcheck_tick)" could potentially overflow. It triggers a static checker warning to have an overflowed addition followed by a no-op cast. I have moved the cast so that the addition can't overflow.

Also I removed the unneeded cast on the following line since both "hangcheck_tsc_margin" and "TIMER_FREQ" are already 64 bit types.

Signed-off-by Dan Carpenter <[email protected]>

drivers/char/hangcheck-timer.c +2 -1

index ebc4c73..a7c5c59 100644
@@ -168,8 +168,8 @@ static int __init hangcheck_init(void)
 	printk("Hangcheck: starting hangcheck timer %s (tick is %d seconds, margin is %d seconds).\n",
 	       VERSION_STR, hangcheck_tick, hangcheck_margin);
 	hangcheck_tsc_margin -		(unsigned long long)(hangcheck_margin + hangcheck_tick);
-	hangcheck_tsc_margin *= (unsigned long long)TIMER_FREQ;
+		(unsigned long long)hangcheck_margin + hangcheck_tick;
+	hangcheck_tsc_margin *= TIMER_FREQ;
 
 	hangcheck_tsc = ktime_get_ns();
 	mod_timer(&hangcheck_ticktock, jiffies + (hangcheck_tick*HZ));