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: 2886477ff9
("media: uvcvideo: Implement UVC_EXT_GPIO_UNIT")
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
Reviewed-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Родитель
882bda188f
Коммит
f0f078457f
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче