[media] v4l: Fix a use-before-set in the control framework
v4l2_queryctrl sets the step value based on the control type. That would be fine if it used the control type stored in the V4L2 kernel control object, not the one stored in the userspace ioctl structure that has just been memset to 0. Fix this. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
01c40c048b
commit
eac9aa005a
|
@ -1352,7 +1352,7 @@ int v4l2_queryctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_queryctrl *qc)
|
|||
qc->minimum = ctrl->minimum;
|
||||
qc->maximum = ctrl->maximum;
|
||||
qc->default_value = ctrl->default_value;
|
||||
if (qc->type == V4L2_CTRL_TYPE_MENU)
|
||||
if (ctrl->type == V4L2_CTRL_TYPE_MENU)
|
||||
qc->step = 1;
|
||||
else
|
||||
qc->step = ctrl->step;
|
||||
|
|
Loading…
Reference in New Issue