From: Hans de Goede <j.w.r.degoede@hhs.nl>
Date: Wed, 3 Sep 2008 20:12:14 +0000 (-0300)
Subject: V4L/DVB (8815): gspca: Fix problems with disabled controls.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0f523c2ff6b5ab3b4412cf56dee77ac57be24103;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

V4L/DVB (8815): gspca: Fix problems with disabled controls.

Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 33161e1e0bcc..e7e73ec7134c 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -869,7 +869,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 		id &= V4L2_CTRL_ID_MASK;
 		id++;
 		for (i = 0; i < gspca_dev->sd_desc->nctrls; i++) {
-			if (id < gspca_dev->sd_desc->ctrls[i].qctrl.id)
+			if (gspca_dev->sd_desc->ctrls[i].qctrl.id < id)
 				continue;
 			if (ix < 0) {
 				ix = i;
@@ -908,6 +908,8 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
 	     i++, ctrls++) {
 		if (ctrl->id != ctrls->qctrl.id)
 			continue;
+		if (gspca_dev->ctrl_dis & (1 << i))
+			return -EINVAL;
 		if (ctrl->value < ctrls->qctrl.minimum
 		    || ctrl->value > ctrls->qctrl.maximum)
 			return -ERANGE;
@@ -934,6 +936,8 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 	     i++, ctrls++) {
 		if (ctrl->id != ctrls->qctrl.id)
 			continue;
+		if (gspca_dev->ctrl_dis & (1 << i))
+			return -EINVAL;
 		if (mutex_lock_interruptible(&gspca_dev->usb_lock))
 			return -ERESTARTSYS;
 		ret = ctrls->get(gspca_dev, &ctrl->value);