summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2012-06-21 06:21:05 -0700
committerGuenter Roeck <linux@roeck-us.net>2012-07-21 21:48:44 -0700
commit75311bea569d7ea77a5a3c5395bae27bb8a2df96 (patch)
tree2ce0cbffa47a9af6640a22f536d081a14d3a85f3 /drivers
parent27c4db3996ef0d27fb25e6991ebf6e507a920937 (diff)
downloadop-kernel-dev-75311bea569d7ea77a5a3c5395bae27bb8a2df96.zip
op-kernel-dev-75311bea569d7ea77a5a3c5395bae27bb8a2df96.tar.gz
hwmon: (acpi_power_meter) Fix unintentional integer overflow
Expression with two integer variables is calculated as integer before it is converted to u64. This may result in an integer overflow. Fix by declaring trip point variables as s64 instead of int. This patch addresses Coverity #200596: Unintentional integer overflow. Signed-off-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwmon/acpi_power_meter.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
index 9a0821f1..5363da5 100644
--- a/drivers/hwmon/acpi_power_meter.c
+++ b/drivers/hwmon/acpi_power_meter.c
@@ -101,7 +101,7 @@ struct acpi_power_meter_resource {
unsigned long sensors_last_updated;
struct sensor_device_attribute sensors[NUM_SENSORS];
int num_sensors;
- int trip[2];
+ s64 trip[2];
int num_domain_devices;
struct acpi_device **domain_devices;
struct kobject *holders_dir;
@@ -308,8 +308,6 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,
return res;
temp = DIV_ROUND_CLOSEST(temp, 1000);
- if (temp > INT_MAX)
- return -EINVAL;
mutex_lock(&resource->lock);
resource->trip[attr->index - 7] = temp;
OpenPOWER on IntegriCloud