Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Sun, 17 Jul 2022 15:43:56 +0200
From:   =?iso-8859-1?Q?Jos=E9_Exp=F3sito?= <jose.exposito89@gmail.com>
To:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc:     mchehab@kernel.org, linux-media@vger.kernel.org,
        linux-kernel@vger.kernel.org, ribalda@chromium.org
Subject: Re: [PATCH RESEND v2] media: uvcvideo: Fix memory leak in
 uvc_gpio_parse
Message-ID: <20220717134356.GA246248@elementary>
References: <20220108170439.49984-1-jose.exposito89@gmail.com>
 <YtG7sRuSIeZNhzNK@pendragon.ideasonboard.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <YtG7sRuSIeZNhzNK@pendragon.ideasonboard.com>
Precedence: bulk

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