Commit f0f07845 authored by José Expósito's avatar José Expósito Committed by Mauro Carvalho Chehab
Browse files

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

Fixes: 2886477f ("media: uvcvideo: Implement UVC_EXT_GPIO_UNIT")
Signed-off-by: default avatarJosé Expósito <jose.exposito89@gmail.com>
Reviewed-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 882bda18

drivers/media/usb/uvc/uvc_driver.c

+4 −4
Original line number Diff line number Diff line
@@ -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;