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

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

[media] ivtv: fix register range check 



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

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Cc: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 771d7733

drivers/media/pci/ivtv/ivtv-ioctl.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -696,6 +696,8 @@ static int ivtv_itvc(struct ivtv *itv, bool get, u64 reg, u64 *val) 
{

{

	volatile u8 __iomem *reg_start;

	volatile u8 __iomem *reg_start;





	if (reg & 0x3)

		return -EINVAL;

	if (reg >= IVTV_REG_OFFSET && reg < IVTV_REG_OFFSET + IVTV_REG_SIZE)

	if (reg >= IVTV_REG_OFFSET && reg < IVTV_REG_OFFSET + IVTV_REG_SIZE)

		reg_start = itv->reg_mem - IVTV_REG_OFFSET;

		reg_start = itv->reg_mem - IVTV_REG_OFFSET;

	else if (itv->has_cx23415 && reg >= IVTV_DECODER_OFFSET &&

	else if (itv->has_cx23415 && reg >= IVTV_DECODER_OFFSET &&