From: Steven Toth <stoth@kernellabs.com>
Date: Mon, 10 Oct 2011 14:09:55 +0000 (-0300)
Subject: [media] cx23885: fixes related to maximum number of inputs and range checking
X-Git-Tag: MMI-PSA29.97-13-9~18177^2~11
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e92bcf8d8abb654cb916f3e615697320bc6bf1e1;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index f13c40e653c1..596b46e7bc51 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -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);