From: Abel Vesa <abel.vesa@nxp.com>
To: xkernel.wang@foxmail.com
Cc: mturquette@baylibre.com, sboyd@kernel.org, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de,
festevam@gmail.com, linux-imx@nxp.com, linux-clk@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] clk: imx: scu: fix a potential memory leak in __imx_clk_gpr_scu()
Date: Tue, 12 Apr 2022 14:05:16 +0300 [thread overview]
Message-ID: <YlVc7J2UMhTc5Rkn@abelvesa> (raw)
In-Reply-To: <tencent_27FF59903EE6AB5C0D0E6D0A8E7059A59007@qq.com>
On 22-04-07 15:37:22, xkernel.wang@foxmail.com wrote:
> From: Xiaoke Wang <xkernel.wang@foxmail.com>
>
> In __imx_clk_gpr_scu(), if imx_scu_clk_is_valid(rsrc_id) fails, then
> `clk_node` which is allocated by kzalloc() is not properly released,
> which may lead to memory leak.
> So this patch added kfree(clk_node) on the above error path before
> return ERR_PTR(-EINVAL).
>
> Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com>
Applied, thanks!
> ---
> drivers/clk/imx/clk-scu.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/clk/imx/clk-scu.c b/drivers/clk/imx/clk-scu.c
> index 083da31..ed3c01d 100644
> --- a/drivers/clk/imx/clk-scu.c
> +++ b/drivers/clk/imx/clk-scu.c
> @@ -837,8 +837,10 @@ struct clk_hw *__imx_clk_gpr_scu(const char *name, const char * const *parent_na
> if (!clk_node)
> return ERR_PTR(-ENOMEM);
>
> - if (!imx_scu_clk_is_valid(rsrc_id))
> + if (!imx_scu_clk_is_valid(rsrc_id)) {
> + kfree(clk_node);
> return ERR_PTR(-EINVAL);
> + }
>
> clk = kzalloc(sizeof(*clk), GFP_KERNEL);
> if (!clk) {
> --
WARNING: multiple messages have this Message-ID (diff)
From: Abel Vesa <abel.vesa@nxp.com>
To: xkernel.wang@foxmail.com
Cc: mturquette@baylibre.com, sboyd@kernel.org, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de,
festevam@gmail.com, linux-imx@nxp.com, linux-clk@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] clk: imx: scu: fix a potential memory leak in __imx_clk_gpr_scu()
Date: Tue, 12 Apr 2022 14:05:16 +0300 [thread overview]
Message-ID: <YlVc7J2UMhTc5Rkn@abelvesa> (raw)
In-Reply-To: <tencent_27FF59903EE6AB5C0D0E6D0A8E7059A59007@qq.com>
On 22-04-07 15:37:22, xkernel.wang@foxmail.com wrote:
> From: Xiaoke Wang <xkernel.wang@foxmail.com>
>
> In __imx_clk_gpr_scu(), if imx_scu_clk_is_valid(rsrc_id) fails, then
> `clk_node` which is allocated by kzalloc() is not properly released,
> which may lead to memory leak.
> So this patch added kfree(clk_node) on the above error path before
> return ERR_PTR(-EINVAL).
>
> Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com>
Applied, thanks!
> ---
> drivers/clk/imx/clk-scu.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/clk/imx/clk-scu.c b/drivers/clk/imx/clk-scu.c
> index 083da31..ed3c01d 100644
> --- a/drivers/clk/imx/clk-scu.c
> +++ b/drivers/clk/imx/clk-scu.c
> @@ -837,8 +837,10 @@ struct clk_hw *__imx_clk_gpr_scu(const char *name, const char * const *parent_na
> if (!clk_node)
> return ERR_PTR(-ENOMEM);
>
> - if (!imx_scu_clk_is_valid(rsrc_id))
> + if (!imx_scu_clk_is_valid(rsrc_id)) {
> + kfree(clk_node);
> return ERR_PTR(-EINVAL);
> + }
>
> clk = kzalloc(sizeof(*clk), GFP_KERNEL);
> if (!clk) {
> --
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-04-12 12:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-07 7:37 [PATCH] clk: imx: scu: fix a potential memory leak in __imx_clk_gpr_scu() xkernel.wang
2022-04-07 7:37 ` xkernel.wang
2022-04-08 11:55 ` Abel Vesa
2022-04-08 11:55 ` Abel Vesa
2022-04-12 11:05 ` Abel Vesa [this message]
2022-04-12 11:05 ` Abel Vesa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YlVc7J2UMhTc5Rkn@abelvesa \
--to=abel.vesa@nxp.com \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=s.hauer@pengutronix.de \
--cc=sboyd@kernel.org \
--cc=shawnguo@kernel.org \
--cc=xkernel.wang@foxmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.