media: uvcvideo: Fix memory leak of object map on error exit path
authorColin Ian King <colin.king@canonical.com>
Fri, 17 Sep 2021 11:49:30 +0000 (13:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Mar 2023 08:40:15 +0000 (09:40 +0100)
commit26f8b1ef30f6f077b477f965008fad39f22411f9
treed962e83fc9d9029611622d625699b0763d8578d8
parent2137e7c83ed6213f9193e258568facd9f85b6abc
media: uvcvideo: Fix memory leak of object map on error exit path

commit 4b065060555b14c7a9b86c013a1c9bee8e8b6fbd upstream.

Currently when the allocation of map->name fails the error exit path
does not kfree the previously allocated object map. Fix this by
setting ret to -ENOMEM and taking the free_map exit error path to
ensure map is kfree'd.

Addresses-Coverity: ("Resource leak")

Fixes: 70fa906d6fce ("media: uvcvideo: Use control names from framework")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/usb/uvc/uvc_v4l2.c