From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from saturn.retrosnub.co.uk ([178.18.118.26]:53774 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751276Ab3G0K62 (ORCPT ); Sat, 27 Jul 2013 06:58:28 -0400 Message-ID: <51F3B5E6.5020507@kernel.org> Date: Sat, 27 Jul 2013 12:58:30 +0100 From: Jonathan Cameron MIME-Version: 1.0 To: Lars-Peter Clausen CC: linux-iio@vger.kernel.org Subject: Re: [PATCH 06/15] staging:iio:adis16260: Add value range check for calibscale/-bias References: <1374072279-7140-1-git-send-email-lars@metafoo.de> <1374072279-7140-6-git-send-email-lars@metafoo.de> In-Reply-To: <1374072279-7140-6-git-send-email-lars@metafoo.de> Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org 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 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; > } >