Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/media/video/gspca/gspca.c

+3 −5
Original line number Diff line number Diff line
@@ -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;

			}

			ctrls = &gspca_dev->sd_desc->ctrls[i];

		}

	} else {