mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 11:32:04 +00:00
[media] cx88: fix register mask
Ensure that the register is aligned to a dword, otherwise the read could read out-of-range data. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Cc: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
da6a855320
commit
7feeb14821
@ -1360,7 +1360,7 @@ static int vidioc_g_register (struct file *file, void *fh,
|
||||
struct cx88_core *core = ((struct cx8800_fh*)fh)->dev->core;
|
||||
|
||||
/* cx2388x has a 24-bit register space */
|
||||
reg->val = cx_read(reg->reg & 0xffffff);
|
||||
reg->val = cx_read(reg->reg & 0xfffffc);
|
||||
reg->size = 4;
|
||||
return 0;
|
||||
}
|
||||
@ -1370,7 +1370,7 @@ static int vidioc_s_register (struct file *file, void *fh,
|
||||
{
|
||||
struct cx88_core *core = ((struct cx8800_fh*)fh)->dev->core;
|
||||
|
||||
cx_write(reg->reg & 0xffffff, reg->val);
|
||||
cx_write(reg->reg & 0xfffffc, reg->val);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user