From: Ricardo Ribalda Date: Wed, 1 Dec 2021 05:22:18 +0000 (+0100) Subject: media: uvcvideo: Avoid returning invalid controls X-Git-Tag: v5.15.179~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a7c8039d2ee46684f01645f089128dd552512b4;p=thirdparty%2Fkernel%2Fstable.git media: uvcvideo: Avoid returning invalid controls commit 414d3b49d9fd4a0bb16a13d929027847fd094f3f upstream. If the memory where ctrl_found is placed has the value of uvc_ctrl and __uvc_find_control does not find the control we will return an invalid index. Fixes: 6350d6a4ed487 ("media: uvcvideo: Set error_idx during ctrl_commit errors") Signed-off-by: Ricardo Ribalda Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 481c959affbf7..0e5b4d54b2c4e 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1709,7 +1709,7 @@ static int uvc_ctrl_find_ctrl_idx(struct uvc_entity *entity, struct uvc_control *uvc_control) { struct uvc_control_mapping *mapping = NULL; - struct uvc_control *ctrl_found; + struct uvc_control *ctrl_found = NULL; unsigned int i; if (!entity)