Commit 771d7733 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] cx18: 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 15c4fee3
...@@ -367,6 +367,8 @@ static int cx18_g_register(struct file *file, void *fh, ...@@ -367,6 +367,8 @@ static int cx18_g_register(struct file *file, void *fh,
{ {
struct cx18 *cx = fh2id(fh)->cx; struct cx18 *cx = fh2id(fh)->cx;
if (reg->reg & 0x3)
return -EINVAL;
if (reg->reg >= CX18_MEM_OFFSET + CX18_MEM_SIZE) if (reg->reg >= CX18_MEM_OFFSET + CX18_MEM_SIZE)
return -EINVAL; return -EINVAL;
reg->size = 4; reg->size = 4;
...@@ -379,6 +381,8 @@ static int cx18_s_register(struct file *file, void *fh, ...@@ -379,6 +381,8 @@ static int cx18_s_register(struct file *file, void *fh,
{ {
struct cx18 *cx = fh2id(fh)->cx; struct cx18 *cx = fh2id(fh)->cx;
if (reg->reg & 0x3)
return -EINVAL;
if (reg->reg >= CX18_MEM_OFFSET + CX18_MEM_SIZE) if (reg->reg >= CX18_MEM_OFFSET + CX18_MEM_SIZE)
return -EINVAL; return -EINVAL;
cx18_write_enc(cx, reg->val, reg->reg); cx18_write_enc(cx, reg->val, reg->reg);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment