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

Commit e92bcf8d authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab
Browse files

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



Signed-off-by: default avatarSteven Toth <stoth@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2cb9ccd4

drivers/media/video/cx23885/cx23885-video.c

+5 −2
Original line number Diff line number Diff line
@@ -1239,7 +1239,7 @@ static int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i) 
	dprintk(1, "%s()\n", __func__);



	n = i->index;

	if (n >= 4)

	if (n >= MAX_CX23885_INPUT)

		return -EINVAL;



	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);



	if (i >= 4) {

	if (i >= MAX_CX23885_INPUT) {

		dprintk(1, "%s() -EINVAL\n", __func__);

		return -EINVAL;

	}



	if (INPUT(i)->type == 0)

		return -EINVAL;



	mutex_lock(&dev->lock);

	cx23885_video_mux(dev, i);

	mutex_unlock(&dev->lock);