Skip to content

Commit

Permalink
iio: imu: adis16480: make sure provided frequency is positive
Browse files Browse the repository at this point in the history
commit 24e1eb5 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: e4f9593 ("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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
commodo authored and gregkh committed Nov 12, 2019
1 parent a428996 commit bee45b4
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/iio/imu/adis16480.c
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,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;

if (val < 0 || val2 < 0)
return -EINVAL;

t = val * 1000 + val2 / 1000;
if (t <= 0)
if (t == 0)
return -EINVAL;

t = 2460000 / t;
Expand Down

0 comments on commit bee45b4

Please sign in to comment.