Skip to contentSkip to conversation

drm/nouveau: off by one in init_i2c_device_find()

PATCH In review Dan Carpenter 2 participants 2 messages May 25, 2010 – Jun 3, 2010

Subsystems (4)
DRM drivers DRM misc Kernel janitors nouveau
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 drm/nouveau: off by one in init_i2c_device_find()

dcb->i2c[] has DCB_MAX_NUM_I2C_ENTRIES entries.

Signed-off-by Dan Carpenter <[email protected]>
drivers/gpu/drm/nouveau/nouveau_bios.c +1 -1
index e7e69cc..bf92a1e 100644
@@ -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;
 	}
#1 lore raw
Quoted 3 lines · Dan Carpenter

dcb->i2c[] has DCB_MAX_NUM_I2C_ENTRIES entries.

Signed-off-by Dan Carpenter <[email protected]>

Thanks, picked this up in the nouveau tree.

Quoted 14 lines
drivers/gpu/drm/nouveau/nouveau_bios.c +1 -1
index e7e69cc..bf92a1e 100644
@@ -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;
 	}