drm/nouveau: fix i2ctable bounds checking
Subsystems (3)
RFC PATCH 1/1 drm/nouveau: fix i2ctable bounds checking
i2c_entries seems to be the number of i2c entries, so with index equal to this number, we could read invalid data from i2ctable. Fix it.
Signed-off-by Marcin Slusarz <[email protected]>
--- drivers/gpu/drm/nouveau/nouveau_bios.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nouveau_bios.c +3 -2
@@ -4984,7 +4984,8 @@ read_dcb_i2c_entry(struct drm_device *dev, int dcb_version, uint8_t *i2ctable, ielse NV_WARN (dev,"DCB I2C table has more entries than indexable " -"(%d entries, max index 15)\n" , i2ctable[2 ]); +"(%d entries, max %d)\n" , i2ctable[2 ], +DCB_MAX_NUM_I2C_ENTRIES ); entry_len = i2ctable[3 ];/* [4] is i2c_default_indices, read in parse_dcb_table() */ }
@@ -5000,7 +5001,7 @@ read_dcb_i2c_entry(struct drm_device *dev, int dcb_version, uint8_t *i2ctable, iif (index ==0xf )return 0 ; -if (index > i2c_entries) { +if (index >= i2c_entries) {NV_ERROR (dev,"DCB I2C index too big (%d > %d)\n" , index, i2ctable[2 ]);return -ENOENT ;
Signature · 1 line
1.6.6.1