2019-08-18 06:01:03

by Wenwen Wang

Subject: [PATCH] media: fdp1: Fix a memory leak bug

In fdp1_open(), 'ctx' is allocated through kzalloc(). However, it is not
deallocated if v4l2_ctrl_new_std() fails, leading to a memory leak bug. To
fix this issue, free 'ctx' before going to the 'done' label.

Signed-off-by: Wenwen Wang <[email protected]>
---
drivers/media/platform/rcar_fdp1.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/media/platform/rcar_fdp1.c b/drivers/media/platform/rcar_fdp1.c
index 43aae9b..9e4b330 100644
--- a/drivers/media/platform/rcar_fdp1.c
+++ b/drivers/media/platform/rcar_fdp1.c
@@ -2122,6 +2122,7 @@ static int fdp1_open(struct file *file)
if (ctx->hdl.error) {
ret = ctx->hdl.error;
v4l2_ctrl_handler_free(&ctx->hdl);
+ kfree(ctx);
goto done;
}

--
2.7.4

2019-08-21 11:41:39

by Kieran Bingham

Subject: Re: [PATCH] media: fdp1: Fix a memory leak bug

Hi Wenwen,

On 18/08/2019 06:58, Wenwen Wang wrote:
> In fdp1_open(), 'ctx' is allocated through kzalloc(). However, it is not
> deallocated if v4l2_ctrl_new_std() fails, leading to a memory leak bug. To
> fix this issue, free 'ctx' before going to the 'done' label.
We could also free it up in the error path, with an if (ret) kfree(ctx);
and remove the kfree which is in the "if (IS_ERR(ctx->fh.m2m_ctx))" check.

But I think that doesn't gain much really. So this is ok by me... If you
prefer that method, then feel free to submit a v2,

Otherwise I think this is fine:

Reviewed-by: Kieran Bingham <[email protected]>

> Signed-off-by: Wenwen Wang <[email protected]>

> ---
> drivers/media/platform/rcar_fdp1.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/media/platform/rcar_fdp1.c b/drivers/media/platform/rcar_fdp1.c
> index 43aae9b..9e4b330 100644
> --- a/drivers/media/platform/rcar_fdp1.c
> +++ b/drivers/media/platform/rcar_fdp1.c
> @@ -2122,6 +2122,7 @@ static int fdp1_open(struct file *file)
> if (ctx->hdl.error) {
> ret = ctx->hdl.error;
> v4l2_ctrl_handler_free(&ctx->hdl);
> + kfree(ctx);
> goto done;
> }
>
>