diff options
| author |   Jean Delvare <khali@linux-fr.org> | 2006-03-22 03:48:32 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-23 11:24:05 -0300 |
| commit | 6eb5d9ca9f1496108cb86f2d9bfc2db5d9c796fe (patch) | |
| tree | 1fe693708ca8aed3f4f81dfb4a5c4254b4968e28 /drivers/media/video | |
| parent | V4L/DVB (3568a): saa7114: Fix i2c block write (diff) | |
| download | linux-dev-6eb5d9ca9f1496108cb86f2d9bfc2db5d9c796fe.tar.xz linux-dev-6eb5d9ca9f1496108cb86f2d9bfc2db5d9c796fe.zip | |
V4L/DVB (3568b): saa7111: Prevent array overrun
Explicitely state the number of registers the SAA7111 has, and use that
defined value where relevant. This should prevent any future array overrun
like the one I just fixed in the saa7110 driver.
This patch also saves 8 bytes of memory as a side effect, as the register
cache was larger than needed.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/saa7111.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c index 8c06592b37ff..a2e1ccb79e49 100644 --- a/drivers/media/video/saa7111.c +++ b/drivers/media/video/saa7111.c @@ -70,8 +70,10 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)"); /* ----------------------------------------------------------------------- */ +#define SAA7111_NR_REG 0x18 + struct saa7111 { - unsigned char reg[32]; + unsigned char reg[SAA7111_NR_REG]; int norm; int input; @@ -227,11 +229,11 @@ saa7111_command (struct i2c_client *client, { int i; - for (i = 0; i < 32; i += 16) { + for (i = 0; i < SAA7111_NR_REG; i += 16) { int j; printk(KERN_DEBUG "%s: %03x", I2C_NAME(client), i); - for (j = 0; j < 16; ++j) { + for (j = 0; j < 16 && i + j < SAA7111_NR_REG; ++j) { printk(" %02x", saa7111_read(client, i + j)); } |