lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0246/1039] media: uvcvideo: Avoid returning invalid controls
    Date
    From: Ricardo Ribalda <ribalda@chromium.org>

    [ Upstream commit 414d3b49d9fd4a0bb16a13d929027847fd094f3f ]

    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: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/usb/uvc/uvc_ctrl.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
    index 9a25d60292558..b4f6edf968bc0 100644
    --- a/drivers/media/usb/uvc/uvc_ctrl.c
    +++ b/drivers/media/usb/uvc/uvc_ctrl.c
    @@ -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)
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 04:39    [W:2.318 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site