| From 118192e87a7ad817a8b07a2e4e060a6afb01c221 Mon Sep 17 00:00:00 2001 |
| From: Alexandru Ardelean <alexandru.ardelean@analog.com> |
| Date: Tue, 8 Oct 2019 17:15:37 +0300 |
| Subject: [PATCH] iio: imu: adis16480: make sure provided frequency is positive |
| |
| commit 24e1eb5c0d78cfb9750b690bbe997d4d59170258 upstream. |
| |
| It could happen that either `val` or `val2` [provided from userspace] is |
| negative. In that case the computed frequency could get a weird value. |
| |
| Fix this by checking that neither of the 2 variables is negative, and check |
| that the computed result is not-zero. |
| |
| Fixes: e4f959390178 ("iio: imu: adis16480 switch sampling frequency attr to core support") |
| Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com> |
| Cc: <Stable@vger.kernel.org> |
| Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/iio/imu/adis16480.c b/drivers/iio/imu/adis16480.c |
| index b99d73887c9f..8743b2f376e2 100644 |
| --- a/drivers/iio/imu/adis16480.c |
| +++ b/drivers/iio/imu/adis16480.c |
| @@ -317,8 +317,11 @@ static int adis16480_set_freq(struct iio_dev *indio_dev, int val, int val2) |
| struct adis16480 *st = iio_priv(indio_dev); |
| unsigned int t, reg; |
| |
| + if (val < 0 || val2 < 0) |
| + return -EINVAL; |
| + |
| t = val * 1000 + val2 / 1000; |
| - if (t <= 0) |
| + if (t == 0) |
| return -EINVAL; |
| |
| /* |
| -- |
| 2.7.4 |
| |