From: Hans Verkuil <hans.verk...@cisco.com>

Ensure that the register is aligned to a dword, otherwise the range check
could fail since it assumes dword alignment.

Signed-off-by: Hans Verkuil <hans.verk...@cisco.com>
Cc: Andy Walls <awa...@md.metrocast.net>
---
 drivers/media/pci/cx18/cx18-ioctl.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/media/pci/cx18/cx18-ioctl.c 
b/drivers/media/pci/cx18/cx18-ioctl.c
index 414b0ec..1110bcb 100644
--- a/drivers/media/pci/cx18/cx18-ioctl.c
+++ b/drivers/media/pci/cx18/cx18-ioctl.c
@@ -367,6 +367,8 @@ static int cx18_g_register(struct file *file, void *fh,
 {
        struct cx18 *cx = fh2id(fh)->cx;
 
+       if (reg->reg & 0x3)
+               return -EINVAL;
        if (reg->reg >= CX18_MEM_OFFSET + CX18_MEM_SIZE)
                return -EINVAL;
        reg->size = 4;
@@ -379,6 +381,8 @@ static int cx18_s_register(struct file *file, void *fh,
 {
        struct cx18 *cx = fh2id(fh)->cx;
 
+       if (reg->reg & 0x3)
+               return -EINVAL;
        if (reg->reg >= CX18_MEM_OFFSET + CX18_MEM_SIZE)
                return -EINVAL;
        cx18_write_enc(cx, reg->val, reg->reg);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to