Messages in this thread | | | From | Ricardo Ribalda <> | Date | Sun, 12 Dec 2021 13:25:23 +0100 | Subject | Re: [PATCH] media: uvcvideo: Fix memory leak in uvc_gpio_parse |
| |
Hi José
Thanks for your patch
On Sun, 12 Dec 2021 at 12:49, José Expósito <jose.exposito89@gmail.com> wrote: > > 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") > Signed-off-by: José Expósito <jose.exposito89@gmail.com> Fixes: 2886477ff987 ("media: uvcvideo: Implement UVC_EXT_GPIO_UNIT") Reviewed-by: Ricardo Ribalda <ribalda@chromium.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 7c007426e082..9e83e2002710 100644 > --- a/drivers/media/usb/uvc/uvc_driver.c > +++ b/drivers/media/usb/uvc/uvc_driver.c > @@ -1533,10 +1533,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) > @@ -1545,6 +1541,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.25.1 >
-- Ricardo Ribalda
| |