media: uvcvideo: Fix memory leak in uvc_gpio_parse
Subsystems (2)
PATCH RESEND v2 1/1 media: uvcvideo: Fix memory leak in uvc_gpio_parse
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")
---
v2: Add Fixes and Reviewed-by tags
--- drivers/media/usb/uvc/uvc_driver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/media/usb/uvc/uvc_driver.c +4 -4
@@ -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 ;
Signature · 1 line
2.25.1
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.
Quoted 10 lines
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 <[email protected]>Reviewed-by Ricardo Ribalda <[email protected]>
Quoted 33 lines
---
v2: Add Fixes and Reviewed-by tags
--- drivers/media/usb/uvc/uvc_driver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/media/usb/uvc/uvc_driver.c +4
-4@@ -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 ;
Signature · 3 lines
Regards, Laurent Pinchart
Quoted 7 lines · Laurent Pinchart
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/[email protected]/T/
José Expósito
Quoted 51 lines
Quoted 10 lines
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 <[email protected]>Reviewed-by Ricardo Ribalda <[email protected]>Reviewed-by Laurent Pinchart <[email protected]>Quoted 33 lines
---
v2: Add Fixes and Reviewed-by tags
--- drivers/media/usb/uvc/uvc_driver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/media/usb/uvc/uvc_driver.c +4
-4@@ -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 ;Signature · 3 lines
Regards, Laurent Pinchart