* [PATCH] clk: mediatek: Fix memory leak on clock init fail
@ 2016-01-08 8:15 ` James Liao
0 siblings, 0 replies; 6+ messages in thread
From: James Liao @ 2016-01-08 8:15 UTC (permalink / raw)
To: Matthias Brugger, Mike Turquette, Stephen Boyd
Cc: Sascha Hauer, Daniel Kurtz, srv_heupstream, linux-arm-kernel,
linux-kernel, linux-mediatek, linux-clk, James Liao
mtk_clk_register_composite() may leak memory due to some error
handling path don't free all allocated memory. This patch
free all pointers that may allocate memory before error return.
And it's safe because kfree() can handle NULL pointers.
Signed-off-by: James Liao <jamesjj.liao@mediatek.com>
---
drivers/clk/mediatek/clk-mtk.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
index cf08db6..3528303 100644
--- a/drivers/clk/mediatek/clk-mtk.c
+++ b/drivers/clk/mediatek/clk-mtk.c
@@ -209,12 +209,14 @@ struct clk * __init mtk_clk_register_composite(const struct mtk_composite *mc,
mc->flags);
if (IS_ERR(clk)) {
- kfree(gate);
- kfree(mux);
+ ret = PTR_ERR(clk);
+ goto err_out;
}
return clk;
err_out:
+ kfree(div);
+ kfree(gate);
kfree(mux);
return ERR_PTR(ret);
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] clk: mediatek: Fix memory leak on clock init fail
@ 2016-01-08 8:15 ` James Liao
0 siblings, 0 replies; 6+ messages in thread
From: James Liao @ 2016-01-08 8:15 UTC (permalink / raw)
To: linux-arm-kernel
mtk_clk_register_composite() may leak memory due to some error
handling path don't free all allocated memory. This patch
free all pointers that may allocate memory before error return.
And it's safe because kfree() can handle NULL pointers.
Signed-off-by: James Liao <jamesjj.liao@mediatek.com>
---
drivers/clk/mediatek/clk-mtk.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
index cf08db6..3528303 100644
--- a/drivers/clk/mediatek/clk-mtk.c
+++ b/drivers/clk/mediatek/clk-mtk.c
@@ -209,12 +209,14 @@ struct clk * __init mtk_clk_register_composite(const struct mtk_composite *mc,
mc->flags);
if (IS_ERR(clk)) {
- kfree(gate);
- kfree(mux);
+ ret = PTR_ERR(clk);
+ goto err_out;
}
return clk;
err_out:
+ kfree(div);
+ kfree(gate);
kfree(mux);
return ERR_PTR(ret);
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] clk: mediatek: Fix memory leak on clock init fail
@ 2016-01-08 8:15 ` James Liao
0 siblings, 0 replies; 6+ messages in thread
From: James Liao @ 2016-01-08 8:15 UTC (permalink / raw)
To: Matthias Brugger, Mike Turquette, Stephen Boyd
Cc: Sascha Hauer, Daniel Kurtz, srv_heupstream, linux-arm-kernel,
linux-kernel, linux-mediatek, linux-clk, James Liao
mtk_clk_register_composite() may leak memory due to some error
handling path don't free all allocated memory. This patch
free all pointers that may allocate memory before error return.
And it's safe because kfree() can handle NULL pointers.
Signed-off-by: James Liao <jamesjj.liao@mediatek.com>
---
drivers/clk/mediatek/clk-mtk.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
index cf08db6..3528303 100644
--- a/drivers/clk/mediatek/clk-mtk.c
+++ b/drivers/clk/mediatek/clk-mtk.c
@@ -209,12 +209,14 @@ struct clk * __init mtk_clk_register_composite(const struct mtk_composite *mc,
mc->flags);
if (IS_ERR(clk)) {
- kfree(gate);
- kfree(mux);
+ ret = PTR_ERR(clk);
+ goto err_out;
}
return clk;
err_out:
+ kfree(div);
+ kfree(gate);
kfree(mux);
return ERR_PTR(ret);
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] clk: mediatek: Fix memory leak on clock init fail
2016-01-08 8:15 ` James Liao
(?)
@ 2016-01-08 8:21 ` Daniel Kurtz
-1 siblings, 0 replies; 6+ messages in thread
From: Daniel Kurtz @ 2016-01-08 8:21 UTC (permalink / raw)
To: James Liao
Cc: Matthias Brugger, Mike Turquette, Stephen Boyd, Sascha Hauer,
srv_heupstream, linux-arm-kernel, linux-kernel,
moderated list:ARM/Mediatek SoC support, linux-clk
On Fri, Jan 8, 2016 at 4:15 PM, James Liao <jamesjj.liao@mediatek.com> wrote:
> mtk_clk_register_composite() may leak memory due to some error
> handling path don't free all allocated memory. This patch
> free all pointers that may allocate memory before error return.
> And it's safe because kfree() can handle NULL pointers.
>
> Signed-off-by: James Liao <jamesjj.liao@mediatek.com>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
> ---
> drivers/clk/mediatek/clk-mtk.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
> index cf08db6..3528303 100644
> --- a/drivers/clk/mediatek/clk-mtk.c
> +++ b/drivers/clk/mediatek/clk-mtk.c
> @@ -209,12 +209,14 @@ struct clk * __init mtk_clk_register_composite(const struct mtk_composite *mc,
> mc->flags);
>
> if (IS_ERR(clk)) {
> - kfree(gate);
> - kfree(mux);
> + ret = PTR_ERR(clk);
> + goto err_out;
> }
>
> return clk;
> err_out:
> + kfree(div);
> + kfree(gate);
> kfree(mux);
>
> return ERR_PTR(ret);
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] clk: mediatek: Fix memory leak on clock init fail
@ 2016-01-08 8:21 ` Daniel Kurtz
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Kurtz @ 2016-01-08 8:21 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jan 8, 2016 at 4:15 PM, James Liao <jamesjj.liao@mediatek.com> wrote:
> mtk_clk_register_composite() may leak memory due to some error
> handling path don't free all allocated memory. This patch
> free all pointers that may allocate memory before error return.
> And it's safe because kfree() can handle NULL pointers.
>
> Signed-off-by: James Liao <jamesjj.liao@mediatek.com>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
> ---
> drivers/clk/mediatek/clk-mtk.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
> index cf08db6..3528303 100644
> --- a/drivers/clk/mediatek/clk-mtk.c
> +++ b/drivers/clk/mediatek/clk-mtk.c
> @@ -209,12 +209,14 @@ struct clk * __init mtk_clk_register_composite(const struct mtk_composite *mc,
> mc->flags);
>
> if (IS_ERR(clk)) {
> - kfree(gate);
> - kfree(mux);
> + ret = PTR_ERR(clk);
> + goto err_out;
> }
>
> return clk;
> err_out:
> + kfree(div);
> + kfree(gate);
> kfree(mux);
>
> return ERR_PTR(ret);
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] clk: mediatek: Fix memory leak on clock init fail
@ 2016-01-08 8:21 ` Daniel Kurtz
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Kurtz @ 2016-01-08 8:21 UTC (permalink / raw)
To: James Liao
Cc: Matthias Brugger, Mike Turquette, Stephen Boyd, Sascha Hauer,
srv_heupstream, linux-arm-kernel, linux-kernel,
moderated list:ARM/Mediatek SoC support, linux-clk
On Fri, Jan 8, 2016 at 4:15 PM, James Liao <jamesjj.liao@mediatek.com> wrote:
> mtk_clk_register_composite() may leak memory due to some error
> handling path don't free all allocated memory. This patch
> free all pointers that may allocate memory before error return.
> And it's safe because kfree() can handle NULL pointers.
>
> Signed-off-by: James Liao <jamesjj.liao@mediatek.com>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
> ---
> drivers/clk/mediatek/clk-mtk.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
> index cf08db6..3528303 100644
> --- a/drivers/clk/mediatek/clk-mtk.c
> +++ b/drivers/clk/mediatek/clk-mtk.c
> @@ -209,12 +209,14 @@ struct clk * __init mtk_clk_register_composite(const struct mtk_composite *mc,
> mc->flags);
>
> if (IS_ERR(clk)) {
> - kfree(gate);
> - kfree(mux);
> + ret = PTR_ERR(clk);
> + goto err_out;
> }
>
> return clk;
> err_out:
> + kfree(div);
> + kfree(gate);
> kfree(mux);
>
> return ERR_PTR(ret);
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-01-08 8:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-08 8:15 [PATCH] clk: mediatek: Fix memory leak on clock init fail James Liao
2016-01-08 8:15 ` James Liao
2016-01-08 8:15 ` James Liao
2016-01-08 8:21 ` Daniel Kurtz
2016-01-08 8:21 ` Daniel Kurtz
2016-01-08 8:21 ` Daniel Kurtz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.