OSDN Git Service

media: uvcvideo: Avoid returning invalid controls
authorRicardo Ribalda <ribalda@chromium.org>
Wed, 1 Dec 2021 05:22:18 +0000 (06:22 +0100)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Tue, 7 Dec 2021 10:29:54 +0000 (11:29 +0100)
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>
drivers/media/usb/uvc/uvc_ctrl.c

index 9a25d60..b4f6edf 100644 (file)
@@ -1639,7 +1639,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)