V4L/DVB (12071): gspca: fix NULL pointer deref in query_ctrl

gspca: fix NULL pointer deref in query_ctrl

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
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 f7e0355ad644f5181bcdbbd36bb3fa1b9483f82e..1e89600986c89bd3ce19e2bf8a2d3f78c1ccd097 100644 (file)
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -1042,13 +1042,11 @@ static int vidioc_queryctrl(struct file *file, void *priv,
                for (i = 0; i < gspca_dev->sd_desc->nctrls; i++) {
                        if (gspca_dev->ctrl_dis & (1 << i))
                                continue;
-                       if (ctrls->qctrl.id < id)
+                       if (gspca_dev->sd_desc->ctrls[i].qctrl.id < id)
                                continue;
-                       if (ctrls != NULL) {
-                               if (gspca_dev->sd_desc->ctrls[i].qctrl.id
+                       if (ctrls && gspca_dev->sd_desc->ctrls[i].qctrl.id
                                            > ctrls->qctrl.id)
-                                       continue;
-                       }
+                               continue;
                        ctrls = &gspca_dev->sd_desc->ctrls[i];
                }
        } else {