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

Prevent reading out-of-range register values.

Signed-off-by: Hans Verkuil <hans.verk...@cisco.com>
Cc: Mauro Carvalho Chehab <mche...@redhat.com>
---
 drivers/media/pci/saa7134/saa7134-video.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/pci/saa7134/saa7134-video.c 
b/drivers/media/pci/saa7134/saa7134-video.c
index 737e643..db4cc1c 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -2258,7 +2258,7 @@ static int vidioc_g_register (struct file *file, void 
*priv,
        struct saa7134_fh *fh = priv;
        struct saa7134_dev *dev = fh->dev;
 
-       reg->val = saa_readb(reg->reg);
+       reg->val = saa_readb(reg->reg & 0xffffff);
        reg->size = 1;
        return 0;
 }
@@ -2269,7 +2269,7 @@ static int vidioc_s_register (struct file *file, void 
*priv,
        struct saa7134_fh *fh = priv;
        struct saa7134_dev *dev = fh->dev;
 
-       saa_writeb(reg->reg&0xffffff, reg->val);
+       saa_writeb(reg->reg & 0xffffff, reg->val);
        return 0;
 }
 #endif
-- 
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