Commit b8bfb5fb authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab

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

gspca: fix NULL pointer deref in query_ctrl
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 14422f9d
...@@ -1042,13 +1042,11 @@ static int vidioc_queryctrl(struct file *file, void *priv, ...@@ -1042,13 +1042,11 @@ static int vidioc_queryctrl(struct file *file, void *priv,
for (i = 0; i < gspca_dev->sd_desc->nctrls; i++) { for (i = 0; i < gspca_dev->sd_desc->nctrls; i++) {
if (gspca_dev->ctrl_dis & (1 << i)) if (gspca_dev->ctrl_dis & (1 << i))
continue; continue;
if (ctrls->qctrl.id < id) if (gspca_dev->sd_desc->ctrls[i].qctrl.id < id)
continue; continue;
if (ctrls != NULL) { if (ctrls && gspca_dev->sd_desc->ctrls[i].qctrl.id
if (gspca_dev->sd_desc->ctrls[i].qctrl.id
> ctrls->qctrl.id) > ctrls->qctrl.id)
continue; continue;
}
ctrls = &gspca_dev->sd_desc->ctrls[i]; ctrls = &gspca_dev->sd_desc->ctrls[i];
} }
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment