[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <a4c47b282d9e3bc5c2891ac1b9cafb9c9970975c.camel@collabora.com>
Date: Mon, 04 Dec 2023 08:55:46 -0500
From: Nicolas Dufresne <nicolas.dufresne@...labora.com>
To: Zeng Chi <zengchi@...inos.cn>, nas.chung@...psnmedia.com,
jackson.lee@...psnmedia.com, mchehab@...nel.org,
sebastian.fricke@...labora.com, hverkuil-cisco@...all.nl,
bob.beckett@...labora.com
Cc: linux-media@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] Fix memory leaks in wave5_vpu_open_enc() and
wave5_vpu_open_dec()
Hi,
Le lundi 04 décembre 2023 à 17:16 +0800, Zeng Chi a écrit :
> This patch fixes memory leaks on error escapes in wave5_vpu_open_enc()
> and wave5_vpu_open_dec().
Please avoid sending twice the same patch. This is still a NAK.
regards,
Nicolas
>
> Fixes: 9707a6254a8a ("media: chips-media: wave5: Add the v4l2 layer")
> Signed-off-by: Zeng Chi <zengchi@...inos.cn>
> ---
> drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c | 5 +++--
> drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c | 5 +++--
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c
> index 8b1417ece96e..b0a045346bb7 100644
> --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c
> +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c
> @@ -1802,9 +1802,10 @@ static int wave5_vpu_open_dec(struct file *filp)
> spin_lock_init(&inst->state_spinlock);
>
> inst->codec_info = kzalloc(sizeof(*inst->codec_info), GFP_KERNEL);
> - if (!inst->codec_info)
> + if (!inst->codec_info) {
> + kfree(inst);
> return -ENOMEM;
> -
> + }
> v4l2_fh_init(&inst->v4l2_fh, vdev);
> filp->private_data = &inst->v4l2_fh;
> v4l2_fh_add(&inst->v4l2_fh);
> diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
> index f29cfa3af94a..bc94de9ea546 100644
> --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
> +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
> @@ -1546,9 +1546,10 @@ static int wave5_vpu_open_enc(struct file *filp)
> inst->ops = &wave5_vpu_enc_inst_ops;
>
> inst->codec_info = kzalloc(sizeof(*inst->codec_info), GFP_KERNEL);
> - if (!inst->codec_info)
> + if (!inst->codec_info) {
> + kfree(inst);
> return -ENOMEM;
> -
> + }
> v4l2_fh_init(&inst->v4l2_fh, vdev);
> filp->private_data = &inst->v4l2_fh;
> v4l2_fh_add(&inst->v4l2_fh);
Powered by blists - more mailing lists