[patch] iio: magnetometer: correct a harmless off by one check

[patch] iio: magnetometer: correct a harmless off by one check

[Dan Carpenter]

The line before limits i to 0-3 so the existing code works fine but the
check is still off by one and >= is intended instead of >.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/iio/magnetometer/mmc35240.c b/drivers/iio/magnetometer/mmc35240.c
index aa6e25d..c71392c 100644
--- a/drivers/iio/magnetometer/mmc35240.c
+++ b/drivers/iio/magnetometer/mmc35240.c
@@ -308,7 +308,7 @@ static int mmc35240_read_raw(struct iio_dev *indio_dev,
 			return ret;
 
 		i = (reg & MMC35240_CTRL1_BW_MASK) >> MMC35240_CTRL1_BW_SHIFT;
-		if (i < 0 || i > ARRAY_SIZE(mmc35240_samp_freq))
+		if (i < 0 || i >= ARRAY_SIZE(mmc35240_samp_freq))
 			return -EINVAL;
 
 		*val = mmc35240_samp_freq[i];

Re: [patch] iio: magnetometer: correct a harmless off by one check

[Daniel Baluta]

On Wed, May 27, 2015 at 11:20 AM, Dan Carpenter
<dan.carpenter@oracle.com> wrote:
> The line before limits i to 0-3 so the existing code works fine but the
> check is still off by one and >= is intended instead of >.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Good catch.

Reviewed-by: Daniel Baluta <daniel.baluta@intel.com>

>
> diff --git a/drivers/iio/magnetometer/mmc35240.c b/drivers/iio/magnetometer/mmc35240.c
> index aa6e25d..c71392c 100644
> --- a/drivers/iio/magnetometer/mmc35240.c
> +++ b/drivers/iio/magnetometer/mmc35240.c
> @@ -308,7 +308,7 @@ static int mmc35240_read_raw(struct iio_dev *indio_dev,
>                         return ret;
>
>                 i = (reg & MMC35240_CTRL1_BW_MASK) >> MMC35240_CTRL1_BW_SHIFT;
> -               if (i < 0 || i > ARRAY_SIZE(mmc35240_samp_freq))
> +               if (i < 0 || i >= ARRAY_SIZE(mmc35240_samp_freq))
>                         return -EINVAL;
>
>                 *val = mmc35240_samp_freq[i];
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [patch] iio: magnetometer: correct a harmless off by one check

[Jonathan Cameron]

On 27/05/15 09:37, Daniel Baluta wrote:
> On Wed, May 27, 2015 at 11:20 AM, Dan Carpenter
> <dan.carpenter@oracle.com> wrote:
>> The line before limits i to 0-3 so the existing code works fine but the
>> check is still off by one and >= is intended instead of >.
>>
>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> Good catch.
> 
> Reviewed-by: Daniel Baluta <daniel.baluta@intel.com>
Applied to the togreg branch of iio.git - initially pushed out as
testing when I have a network that does anything other than https.

J
> 
>>
>> diff --git a/drivers/iio/magnetometer/mmc35240.c b/drivers/iio/magnetometer/mmc35240.c
>> index aa6e25d..c71392c 100644
>> --- a/drivers/iio/magnetometer/mmc35240.c
>> +++ b/drivers/iio/magnetometer/mmc35240.c
>> @@ -308,7 +308,7 @@ static int mmc35240_read_raw(struct iio_dev *indio_dev,
>>                         return ret;
>>
>>                 i = (reg & MMC35240_CTRL1_BW_MASK) >> MMC35240_CTRL1_BW_SHIFT;
>> -               if (i < 0 || i > ARRAY_SIZE(mmc35240_samp_freq))
>> +               if (i < 0 || i >= ARRAY_SIZE(mmc35240_samp_freq))
>>                         return -EINVAL;
>>
>>                 *val = mmc35240_samp_freq[i];
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>