summaryrefslogtreecommitdiffstats
path: root/drivers/staging/iio/accel/sca3000_core.c
diff options
context:
space:
mode:
authorAndreas Ruprecht2011-12-02 17:30:23 +0100
committerGreg Kroah-Hartman2011-12-08 20:30:24 +0100
commitd666c0d490d85d35fe6d6d45ba029cf16046dc82 (patch)
tree4c05c17164216b5db6dcdb80b78a06d0f2cc4573 /drivers/staging/iio/accel/sca3000_core.c
parentStaging: iio/accel: Changed data type of mask in store_measurement_mode() to u8 (diff)
downloadkernel-qcow2-linux-d666c0d490d85d35fe6d6d45ba029cf16046dc82.tar.gz
kernel-qcow2-linux-d666c0d490d85d35fe6d6d45ba029cf16046dc82.tar.xz
kernel-qcow2-linux-d666c0d490d85d35fe6d6d45ba029cf16046dc82.zip
Staging: iio/accel: Added a range check for val in store_measurement_mode()
In sca3000_store_measurement_mode() we use val to and it with a mask. This mask is only two bits long (as we are only interested in the lowest two bits), so a value bigger than 3 was silently ignored so far. Now this function will return -EINVAL, if val is bigger than 3. Signed-off-by: Andreas Ruprecht <rupran@einserver.de> Acked-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/accel/sca3000_core.c')
-rw-r--r--drivers/staging/iio/accel/sca3000_core.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index 12f1e4bc769c..a1277d2700ee 100644
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ b/drivers/staging/iio/accel/sca3000_core.c
@@ -389,6 +389,10 @@ sca3000_store_measurement_mode(struct device *dev,
ret = kstrtou8(buf, 10, &val);
if (ret)
goto error_ret;
+ if (val > 3) {
+ ret = -EINVAL;
+ goto error_ret;
+ }
ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_MODE, 1);
if (ret)
goto error_ret;