diff options
| author | Jean Delvare <khali@linux-fr.org> | 2006-03-22 09:48:30 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-23 17:24:16 +0300 |
| commit | 6201573cc9bfe1e0bdec229bed8e95b0dc88a587 (patch) | |
| tree | 35a5377e4bc8ba7a94d53631911638b5a739034a /drivers/media | |
| parent | f49a5eaea6d7b3ed3d01ca9388eac9e7e5bf6025 (diff) | |
| download | linux-6201573cc9bfe1e0bdec229bed8e95b0dc88a587.tar.xz | |
V4L/DVB (3568f): saa7110: Fix array overrun
Fix a (probably harmless) array overrun in the DECODER_DUMP command of the
saa7110 driver. No big deal as this command is not used anywhere anyway.
Also reformat the dump so that it displays nicely.
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')
| -rw-r--r-- | drivers/media/video/saa7110.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c index 7bb85a7b326e..20cad9fc99ef 100644 --- a/drivers/media/video/saa7110.c +++ b/drivers/media/video/saa7110.c @@ -432,15 +432,13 @@ saa7110_command (struct i2c_client *client, break; case DECODER_DUMP: - for (v = 0; v < 0x34; v += 16) { + for (v = 0; v < SAA7110_NR_REG; v += 16) { int j; - dprintk(1, KERN_INFO "%s: %03x\n", I2C_NAME(client), + dprintk(1, KERN_DEBUG "%s: %02x:", I2C_NAME(client), v); - for (j = 0; j < 16; j++) { - dprintk(1, KERN_INFO " %02x", - decoder->reg[v + j]); - } - dprintk(1, KERN_INFO "\n"); + for (j = 0; j < 16 && v + j < SAA7110_NR_REG; j++) + dprintk(1, " %02x", decoder->reg[v + j]); + dprintk(1, "\n"); } break; |