2016-12-07 17:23:58

by Santosh Kumar Singh

Subject: [PATCH] vim2m: Clean up file handle in open() error path.

Fix to avoid possible memory leak and exit file handle
in error paths.

Signed-off-by: Santosh Kumar Singh <[email protected]>
---
drivers/media/platform/vim2m.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/media/platform/vim2m.c b/drivers/media/platform/vim2m.c
index a98f679..9fd24b8 100644
--- a/drivers/media/platform/vim2m.c
+++ b/drivers/media/platform/vim2m.c
@@ -907,6 +907,7 @@ static int vim2m_open(struct file *file)
if (hdl->error) {
rc = hdl->error;
v4l2_ctrl_handler_free(hdl);
+ kfree(ctx);
goto open_unlock;
}
ctx->fh.ctrl_handler = hdl;
@@ -929,6 +930,7 @@ static int vim2m_open(struct file *file)

v4l2_ctrl_handler_free(hdl);
kfree(ctx);
+ v4l2_fh_exit(&ctx->fh);
goto open_unlock;
}

--
1.9.1

2016-12-12 09:37:40

by Laurent Pinchart

Subject: Re: [PATCH] vim2m: Clean up file handle in open() error path.

Hi Santosh,

Thank you for the patch.

On Wednesday 07 Dec 2016 22:53:39 Santosh Kumar Singh wrote:
> Fix to avoid possible memory leak and exit file handle
> in error paths.
>
> Signed-off-by: Santosh Kumar Singh <[email protected]>
> ---
> drivers/media/platform/vim2m.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/media/platform/vim2m.c b/drivers/media/platform/vim2m.c
> index a98f679..9fd24b8 100644
> --- a/drivers/media/platform/vim2m.c
> +++ b/drivers/media/platform/vim2m.c
> @@ -907,6 +907,7 @@ static int vim2m_open(struct file *file)
> if (hdl->error) {
> rc = hdl->error;
> v4l2_ctrl_handler_free(hdl);
> + kfree(ctx);
> goto open_unlock;
> }
> ctx->fh.ctrl_handler = hdl;
> @@ -929,6 +930,7 @@ static int vim2m_open(struct file *file)
>
> v4l2_ctrl_handler_free(hdl);
> kfree(ctx);
> + v4l2_fh_exit(&ctx->fh);

Don't you notice something wrong in those last two lines ?

> goto open_unlock;
> }

--
Regards,

Laurent Pinchart

2016-12-16 12:34:34

by Laurent Pinchart

Subject: Re: [PATCH] vim2m: Clean up file handle in open() error path.

On Friday 16 Dec 2016 14:31:15 santosh kumar singh wrote:
> Dear Mr. laurent,
>
> Can you please check the patch submitted by me.

No, because I haven't received it :-) You've sent it as an HTML message it it
thus got dropped by the mailing list. Please don't send HTML e-mails.

While at it, when submitting a new version of a patch, please indicate that in
the subject line. It should have been [PATCH v2]. Otherwise it's difficult for
us to figure out if the patch is a duplicate or a new version, or to find the
latest version.

--
Regards,

Laurent Pinchart