Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2cac168 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] mxb: check register address when reading/writing a register 



Prevent out-of-range register accesses.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b8300702

drivers/media/pci/saa7146/mxb.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

}