diff options
author | Steven Toth <stoth@kernellabs.com> | 2010-07-31 15:11:59 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 07:54:53 -0200 |
commit | 46eeb8dd30d3651e6ea55c2e60594206cd591d79 (patch) | |
tree | ec3d2d34b7f6e7c68aadec8aca8091e213e274c4 /drivers/media/video/saa7164/saa7164-core.c | |
parent | 58acca1056434dbbbcb3f1aacd759f1039a3169d (diff) | |
download | op-kernel-dev-46eeb8dd30d3651e6ea55c2e60594206cd591d79.zip op-kernel-dev-46eeb8dd30d3651e6ea55c2e60594206cd591d79.tar.gz |
[media] saa7164: add guard bytes around critical buffers to detect failure
If the guard bytes are trampled then we have a memory related problem.
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7164/saa7164-core.c')
-rw-r--r-- | drivers/media/video/saa7164/saa7164-core.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/drivers/media/video/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c index 624ad3e..e96bbe4 100644 --- a/drivers/media/video/saa7164/saa7164-core.c +++ b/drivers/media/video/saa7164/saa7164-core.c @@ -216,6 +216,7 @@ static void saa7164_work_enchandler(struct work_struct *w) struct saa7164_user_buffer *ubuf; struct list_head *c, *n; int wp, rp, i = 0; + u8 *p; port->last_svc_msecs_diff = port->last_svc_msecs; port->last_svc_msecs = jiffies_to_msecs(jiffies); @@ -262,6 +263,20 @@ static void saa7164_work_enchandler(struct work_struct *w) break; } + p = (u8 *)buf->cpu; + if ( (*(p + buf->actual_size + 0) != 0xff) || + (*(p + buf->actual_size + 1) != 0xff) || + (*(p + buf->actual_size + 2) != 0xff) || + (*(p + buf->actual_size + 3) != 0xff) || + (*(p + buf->actual_size + 0x10) != 0xff) || + (*(p + buf->actual_size + 0x11) != 0xff) || + (*(p + buf->actual_size + 0x12) != 0xff) || + (*(p + buf->actual_size + 0x13) != 0xff) ) + { + printk(KERN_ERR "buf %p failed guard check\n", buf); + saa7164_dumphex16(dev, p + buf->actual_size - 32, 64); + } + if (buf->idx == rp) { /* Found the buffer, deal with it */ dprintk(DBGLVL_IRQ, "%s() wp: %d processing: %d\n", @@ -278,9 +293,12 @@ static void saa7164_work_enchandler(struct work_struct *w) ubuf = list_first_entry(&port->list_buf_free.list, struct saa7164_user_buffer, list); - if (ubuf->actual_size == buf->actual_size) + if (ubuf->actual_size == buf->actual_size) { memcpy(ubuf->data, buf->cpu, ubuf->actual_size); + } else { + printk(KERN_ERR "buf %p actual fails match\n", buf); + } /* Requeue the buffer on the free list */ ubuf->pos = 0; @@ -297,7 +315,7 @@ static void saa7164_work_enchandler(struct work_struct *w) /* Ensure offset into buffer remains 0, fill buffer * with known bad data. */ saa7164_buffer_zero_offsets(port, rp); - memset(buf->cpu, 0xDE, buf->pci_size); + memset(buf->cpu, 0xff, buf->pci_size); break; } |