Re: [patch] drm/nouveau: off by one in init_i2c_device_find()

Ben Skeggs
2010-06-03T01:22:57Z

On Tue, 2010-05-25 at 11:52 +0200, Dan Carpenter wrote:
> dcb->i2c[] has DCB_MAX_NUM_I2C_ENTRIES entries.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
Thanks, picked this up in the nouveau tree.

>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
> index e7e69cc..bf92a1e 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bios.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
> @@ -814,7 +814,7 @@ init_i2c_device_find(struct drm_device *dev, int i2c_index)
> if (i2c_index = 0x81)
> i2c_index = (dcb->i2c_default_indices & 0xf0) >> 4;
>
> - if (i2c_index > DCB_MAX_NUM_I2C_ENTRIES) {
> + if (i2c_index >= DCB_MAX_NUM_I2C_ENTRIES) {
> NV_ERROR(dev, "invalid i2c_index 0x%x\n", i2c_index);
> return NULL;
> }