Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[media] cx23885: fixes related to maximum number of inputs and range checking

Browse source 
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Steven Toth 2011-10-10 11:09:55 -03:00 committed by Mauro Carvalho Chehab
parent 2cb9ccd461
commit e92bcf8d8a
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/media/video/cx23885/cx23885-video.c
View file

@ -1239,7 +1239,7 @@ static int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)
dprintk(1, "%s()\n", __func__); dprintk(1, "%s()\n", __func__);
n = i->index; n = i->index;
if (n >= 4) if (n >= MAX_CX23885_INPUT)
return -EINVAL; return -EINVAL;
if (0 == INPUT(n)->type) if (0 == INPUT(n)->type)
@ -1279,11 +1279,14 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
dprintk(1, "%s(%d)\n", __func__, i); dprintk(1, "%s(%d)\n", __func__, i);
if (i >= 4) { if (i >= MAX_CX23885_INPUT) {
dprintk(1, "%s() -EINVAL\n", __func__); dprintk(1, "%s() -EINVAL\n", __func__);
return -EINVAL; return -EINVAL;
} }
if (INPUT(i)->type == 0)
return -EINVAL;
mutex_lock(&dev->lock); mutex_lock(&dev->lock);
cx23885_video_mux(dev, i); cx23885_video_mux(dev, i);
mutex_unlock(&dev->lock); mutex_unlock(&dev->lock);