openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: iio: adis16060_core: Fix error handling 

We need to check adis16060_spi_read return code to avoid feeding user
space with bogus data.
While, at it introduce out_unlock label in order to simplify locking
on error path.

Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Cristina Moraru 2015-10-25 23:31:41 +02:00 committed by Greg Kroah-Hartman
parent 1c58f0eb9c
commit 31a99443a5
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/iio/gyro/adis16060_core.c
View File

@ -89,11 +89,13 @@ static int adis16060_read_raw(struct iio_dev *indio_dev,
/* Take the iio_dev status lock */ /* Take the iio_dev status lock */
mutex_lock(&indio_dev->mlock); mutex_lock(&indio_dev->mlock);
ret = adis16060_spi_write(indio_dev, chan->address); ret = adis16060_spi_write(indio_dev, chan->address);
if (ret < 0) { if (ret < 0)
mutex_unlock(&indio_dev->mlock); goto out_unlock;
return ret;
}
ret = adis16060_spi_read(indio_dev, &tval); ret = adis16060_spi_read(indio_dev, &tval);
if (ret < 0)
goto out_unlock;
mutex_unlock(&indio_dev->mlock); mutex_unlock(&indio_dev->mlock);
*val = tval; *val = tval;
return IIO_VAL_INT; return IIO_VAL_INT;
@ -108,6 +110,10 @@ static int adis16060_read_raw(struct iio_dev *indio_dev,
} }
return -EINVAL; return -EINVAL;
out_unlock:
mutex_unlock(&indio_dev->mlock);
return ret;
} }
static const struct iio_info adis16060_info = { static const struct iio_info adis16060_info = {