linux-kernel - Re: [PATCH] clk: fix memory leak in hisi_clk

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <ZNlSH+eWV8Sk3FYn@probook>
Date:   Sun, 13 Aug 2023 23:58:55 +0200
From:   Jonathan Neuschäfer <j.neuschaefer@....net>
To:     Tao Lan <taolan@...wei.com>
Cc:     mturquette@...libre.com, sboyd@...nel.org, j.neuschaefer@....net,
        linux-clk@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] clk: fix memory leak in hisi_clk_init.

Hello,

sorry for the delay, but I found this unmerged patch while cleaning up
my mailbox.

On Thu, Dec 22, 2022 at 09:12:21AM +0000, Tao Lan wrote:
> From: taolan <taolan@...wei.com>
> 
> when clk_data create fail, we also need to release base.
> 
> Signed-off-by: taolan <taolan@...wei.com>
> ---
>  drivers/clk/hisilicon/clk.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/clk/hisilicon/clk.c b/drivers/clk/hisilicon/clk.c
> index 54d9fdc93599..9ca4fc05fa57 100644
> --- a/drivers/clk/hisilicon/clk.c
> +++ b/drivers/clk/hisilicon/clk.c
> @@ -82,6 +82,10 @@ struct hisi_clock_data *hisi_clk_init(struct device_node *np,
>  	of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data->clk_data);
>  	return clk_data;
>  err_data:
> +	if (base) {
> +		iounmap(base);
> +		base = NULL;
> +	}

This is inaccurate. Consider the case when kzalloc fails:

	clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL);
	if (!clk_data)
		goto err;

base has already been mapped, but the code jumps to 'err', which doesn't
have the iounmap.

To address this properly, you'd have to add another label between
err_data and err.


>  	kfree(clk_data);
>  err:
>  	return NULL;


Best regards,
jn

Download attachment "signature.asc" of type "application/pgp-signature" (834 bytes)