[v2] media: uvcvideo: Fix memory leak in uvc_gpio_parse

[PATCH RESEND v2] media: uvcvideo: Fix memory leak in uvc_gpio_parse

Posted by José Expósito 4 years, 5 months ago

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>

---

v2: Add Fixes and Reviewed-by tags
---
 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

Re: [PATCH RESEND v2] media: uvcvideo: Fix memory leak in uvc_gpio_parse

Posted by Laurent Pinchart 3 years, 11 months ago

Hi José,

Thank you for the patch.

On Sat, Jan 08, 2022 at 06:04:39PM +0100, José Expósito wrote:

I can't believe I've managed to ignore this patch for so long :-( Sorry.

> 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>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> 
> v2: Add Fixes and Reviewed-by tags
> ---
>  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;

-- 
Regards,

Laurent Pinchart

Re: [PATCH RESEND v2] media: uvcvideo: Fix memory leak in uvc_gpio_parse

Posted by José Expósito 3 years, 11 months ago

On Fri, Jul 15, 2022 at 10:10:41PM +0300, Laurent Pinchart wrote:
> Hi José,
> 
> Thank you for the patch.
> 
> On Sat, Jan 08, 2022 at 06:04:39PM +0100, José Expósito wrote:
> 
> I can't believe I've managed to ignore this patch for so long :-( Sorry.

Hi Laurent,

No problem, thanks for reviewing it, I just emailed you v3:
https://lore.kernel.org/linux-media/20220717133847.245703-1-jose.exposito89@gmail.com/T/

José Expósito
 
> > 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>
> 
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
> > ---
> > 
> > v2: Add Fixes and Reviewed-by tags
> > ---
> >  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;
> 
> -- 
> Regards,
> 
> Laurent Pinchart