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>

diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index 077e1eb7535bef4cc179b5b1a6eecd1571e87e0e..023412b2a9b934ca2a97509483939c01e753d2b7 100644 (file)
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -44,8 +44,10 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain,
        if (v4l2_ctrl_get_name(map->id) == NULL) {
                map->name = kmemdup(xmap->name, sizeof(xmap->name),
                                    GFP_KERNEL);
-               if (!map->name)
-                       return -ENOMEM;
+               if (!map->name) {
+                       ret = -ENOMEM;
+                       goto free_map;
+               }
        }
        memcpy(map->entity, xmap->entity, sizeof(map->entity));
        map->selector = xmap->selector;