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 <ribalda@chromium.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index 481c959affbf7462e9fb46aac0b65e64948c7ed4..0e5b4d54b2c4ea1f61193d4f29a98d4ae1867d0a 100644 (file)
--- 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)