From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Sat, 13 Apr 2013 10:39:19 +0000 (-0300)
Subject: [media] cx25821: s_input didn't check for invalid input
X-Git-Tag: v3.10-rc1~159^2^2~16^2~22
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6b1dce251fa21caea4e0021fd3fd0d8dcdece784;p=karo-tx-linux.git

[media] cx25821: s_input didn't check for invalid input

The s_input implementation allowed input 1 even if that didn't exist.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/pci/cx25821/cx25821-video.c b/drivers/media/pci/cx25821/cx25821-video.c
index a9aa09651cab..9ddc7ac03a73 100644
--- a/drivers/media/pci/cx25821/cx25821-video.c
+++ b/drivers/media/pci/cx25821/cx25821-video.c
@@ -1163,10 +1163,8 @@ int cx25821_vidioc_s_input(struct file *file, void *priv, unsigned int i)
 			return err;
 	}
 
-	if (i >= CX25821_NR_INPUT) {
-		dprintk(1, "%s(): -EINVAL\n", __func__);
+	if (i >= CX25821_NR_INPUT || INPUT(i)->type == 0)
 		return -EINVAL;
-	}
 
 	mutex_lock(&dev->lock);
 	cx25821_video_mux(dev, i);