Re: [PATCH 06/15] staging:iio:adis16260: Add value range check for calibscale/-bias

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 07/17/13 15:44, Lars-Peter Clausen wrote:
> Instead of just cutting of the upper bits of the value make sure that the value
> is in the valid range and return an error if it is not.
> 
> Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Good spot.

Applied to the togreg branch of iio.git

Thanks,
> ---
>  drivers/staging/iio/gyro/adis16260_core.c | 15 +++++++++------
>  1 file changed, 9 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/staging/iio/gyro/adis16260_core.c b/drivers/staging/iio/gyro/adis16260_core.c
> index a01c243..55e6795 100644
> --- a/drivers/staging/iio/gyro/adis16260_core.c
> +++ b/drivers/staging/iio/gyro/adis16260_core.c
> @@ -311,18 +311,21 @@ static int adis16260_write_raw(struct iio_dev *indio_dev,
>  			       long mask)
>  {
>  	struct adis *adis = iio_priv(indio_dev);
> -	int bits = 12;
> -	s16 val16;
>  	u8 addr;
> +
>  	switch (mask) {
>  	case IIO_CHAN_INFO_CALIBBIAS:
> -		val16 = val & ((1 << bits) - 1);
> +		if (val < -2048 || val >= 2048)
> +			return -EINVAL;
> +
>  		addr = adis16260_addresses[chan->scan_index][0];
> -		return adis_write_reg_16(adis, addr, val16);
> +		return adis_write_reg_16(adis, addr, val);
>  	case IIO_CHAN_INFO_CALIBSCALE:
> -		val16 = val & ((1 << bits) - 1);
> +		if (val < 0 || val >= 4096)
> +			return -EINVAL;
> +
>  		addr = adis16260_addresses[chan->scan_index][1];
> -		return adis_write_reg_16(adis, addr, val16);
> +		return adis_write_reg_16(adis, addr, val);
>  	}
>  	return -EINVAL;
>  }
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Input]     [Linux Kernel]     [Linux SCSI]     [X.org]

  Powered by Linux