lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 495/862] media: uvcvideo: Fix memory leak in uvc_gpio_parse
    Date
    From: José Expósito <jose.exposito89@gmail.com>

    [ Upstream commit f0f078457f18f10696888f8d0e6aba9deb9cde92 ]

    Previously the unit buffer was allocated before checking the IRQ for
    privacy GPIO. In case of error, the unit buffer was leaked.

    Allocate the unit buffer after the IRQ to avoid it.

    Addresses-Coverity-ID: 1474639 ("Resource leak")

    Fixes: 2886477ff987 ("media: uvcvideo: Implement UVC_EXT_GPIO_UNIT")
    Signed-off-by: José Expósito <jose.exposito89@gmail.com>
    Reviewed-by: Ricardo Ribalda <ribalda@chromium.org>
    Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/usb/uvc/uvc_driver.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
    index d509a4a2f08e..822e9694f092 100644
    --- a/drivers/media/usb/uvc/uvc_driver.c
    +++ b/drivers/media/usb/uvc/uvc_driver.c
    @@ -1553,10 +1553,6 @@ static int uvc_gpio_parse(struct uvc_device *dev)
    if (IS_ERR_OR_NULL(gpio_privacy))
    return PTR_ERR_OR_ZERO(gpio_privacy);

    - unit = uvc_alloc_entity(UVC_EXT_GPIO_UNIT, UVC_EXT_GPIO_UNIT_ID, 0, 1);
    - if (!unit)
    - return -ENOMEM;
    -
    irq = gpiod_to_irq(gpio_privacy);
    if (irq < 0) {
    if (irq != EPROBE_DEFER)
    @@ -1565,6 +1561,10 @@ static int uvc_gpio_parse(struct uvc_device *dev)
    return irq;
    }

    + unit = uvc_alloc_entity(UVC_EXT_GPIO_UNIT, UVC_EXT_GPIO_UNIT_ID, 0, 1);
    + if (!unit)
    + return -ENOMEM;
    +
    unit->gpio.gpio_privacy = gpio_privacy;
    unit->gpio.irq = irq;
    unit->gpio.bControlSize = 1;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 11:14    [W:2.521 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site