MIME-Version: 1.0
References: <20211208174158.114122-1-amhamza.mgc@gmail.com>
In-Reply-To: <20211208174158.114122-1-amhamza.mgc@gmail.com>
From:   Ricardo Ribalda <ribalda@chromium.org>
Date:   Thu, 9 Dec 2021 09:54:06 +0100
Message-ID: <CANiDSCu-Q=VqkS1_B-1pvc4uZtUZynRYkpyu2ZASddSqsmT31A@mail.gmail.com>
Subject: Re: [PATCH] media: uvcvideo: fix possible memory leak issue
To:     Ameer Hamza <amhamza.mgc@gmail.com>
Cc:     laurent.pinchart@ideasonboard.com, mchehab@kernel.org,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Hi Ameer

Thanks for the patch.

It is already covered by
https://lore.kernel.org/lkml/20210917114930.47261-1-colin.king@canonical.com/
which is in the staging branch of the media tree.

Thanks!

On Thu, 9 Dec 2021 at 01:33, Ameer Hamza <amhamza.mgc@gmail.com> wrote:
>
> In uvc_ioctl_ctrl_map() implementation, there is a possibility of memory
> leak if control id name is not listed and kmemdup() is failed somehow.
> This is a rare scenario but possible.
>
> Addresses-Coverity: 1494069 (Resource leak)
> Signed-off-by: Ameer Hamza <amhamza.mgc@gmail.com>
> ---
>  drivers/media/usb/uvc/uvc_v4l2.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
> index f4e4aff8ddf7..711556d13d03 100644
> --- 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;
> --
> 2.25.1
>


-- 
Ricardo Ribalda