]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[media] mxb: check register address when reading/writing a register
authorHans Verkuil <hans.verkuil@cisco.com>
Wed, 29 May 2013 10:00:00 +0000 (07:00 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 17 Jun 2013 11:53:48 +0000 (08:53 -0300)
Prevent out-of-range register accesses.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/pci/saa7146/mxb.c

index 8d177691cd7c60c198b38c11dfd8850b0fe292bd..33abe332d17599936c691eeeb2e4f836d6bc5d0b 100644 (file)
@@ -669,6 +669,8 @@ static int vidioc_g_register(struct file *file, void *fh, struct v4l2_dbg_regist
 {
        struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
 
+       if (reg->reg > pci_resource_len(dev->pci, 0) - 4)
+               return -EINVAL;
        reg->val = saa7146_read(dev, reg->reg);
        reg->size = 4;
        return 0;
@@ -678,6 +680,8 @@ static int vidioc_s_register(struct file *file, void *fh, const struct v4l2_dbg_
 {
        struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
 
+       if (reg->reg > pci_resource_len(dev->pci, 0) - 4)
+               return -EINVAL;
        saa7146_write(dev, reg->reg, reg->val);
        return 0;
 }