summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2012-06-21 15:26:12 +0200
committerGuenter Roeck <linux@roeck-us.net>2012-07-22 06:48:28 +0200
commit62867d491a27affee36194d4856564f2f4e12b3c (patch)
treec6befa5f0b75a14e1c36b932a433b05087f2a413 /drivers
parenthwmon: (w83627ehf) Add missing break statement (diff)
downloadlinux-62867d491a27affee36194d4856564f2f4e12b3c.tar.xz
linux-62867d491a27affee36194d4856564f2f4e12b3c.zip
hwmon: (fam15h_power) Fix unintentional integer overflow
Expression with two unsigned integer variables is calculated as unsigned integer before it is converted to u64. This may result in an integer overflow. Fix by typecasting the left operand to u64 before performing the left shift. This patch addresses Coverity #402320: Unintentional integer overflow. Signed-off-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Jean Delvare <khali@linux-fr.org> Acked-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwmon/fam15h_power.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c
index 6b13f1a4dc27..2764b78a784b 100644
--- a/drivers/hwmon/fam15h_power.c
+++ b/drivers/hwmon/fam15h_power.c
@@ -67,7 +67,8 @@ static ssize_t show_power(struct device *dev,
REG_TDP_LIMIT3, &val);
tdp_limit = val >> 16;
- curr_pwr_watts = (tdp_limit + data->base_tdp) << running_avg_range;
+ curr_pwr_watts = ((u64)(tdp_limit +
+ data->base_tdp)) << running_avg_range;
curr_pwr_watts -= running_avg_capture;
curr_pwr_watts *= data->tdp_to_watts;