linux-kernel - Re: [PATCH 3/3] clk: keystone: Fix missing iounmap calls in an error handling path

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <580F04D9.108@bfs.de>
Date:   Tue, 25 Oct 2016 09:08:09 +0200
From:   walter harms <wharms@....de>
To:     Christophe JAILLET <christophe.jaillet@...adoo.fr>
CC:     lars@...afoo.de, dan.carpenter@...cle.com, ssantosh@...nel.org,
        mturquette@...libre.com, sboyd@...eaurora.org,
        linux-clk@...r.kernel.org, linux-kernel@...r.kernel.org,
        kernel-janitors@...r.kernel.org
Subject: Re: [PATCH 3/3] clk: keystone: Fix missing iounmap calls in an error
 handling path



Am 24.10.2016 22:43, schrieb Christophe JAILLET:
> Factorize 'iounmap()' calls in the error handling path.
> The main goal is to add these calls if 'clk_register_pll()' fails.
> 
> Add an error message if an 'of_iomap' call fails to be consistent.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@...adoo.fr>
> ---
> Un-compiled & un-tested
> ---
>  drivers/clk/keystone/pll.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/clk/keystone/pll.c b/drivers/clk/keystone/pll.c
> index 35c0e2b011d1..73a2558b29c0 100644
> --- a/drivers/clk/keystone/pll.c
> +++ b/drivers/clk/keystone/pll.c
> @@ -191,7 +191,6 @@ static void __init _of_pll_clk_init(struct device_node *node, bool pllctrl)
>  	pll_data->pll_ctl0 = of_iomap(node, i);
>  	if (!pll_data->pll_ctl0) {
>  		pr_err("%s: ioremap failed\n", __func__);
> -		iounmap(pll_data->pllod);
>  		goto out;
>  	}
>  
> @@ -206,8 +205,7 @@ static void __init _of_pll_clk_init(struct device_node *node, bool pllctrl)
>  		i = of_property_match_string(node, "reg-names", "multiplier");
>  		pll_data->pllm = of_iomap(node, i);
>  		if (!pll_data->pllm) {
> -			iounmap(pll_data->pll_ctl0);
> -			iounmap(pll_data->pllod);
> +			pr_err("%s: ioremap failed\n", __func__);
>  			goto out;
>  		}
>  	}
> @@ -220,6 +218,12 @@ static void __init _of_pll_clk_init(struct device_node *node, bool pllctrl)
>  
>  out:
>  	pr_err("%s: error initializing pll %s\n", __func__, node->name);
> +	if (pll_data->pllm)
> +		iounmap(pll_data->pllm);
> +	if (pll_data->pll_ctl0)
> +		iounmap(pll_data->pll_ctl0);
> +	if (pll_data->pllod)
> +		iounmap(pll_data->pllod);
>  	kfree(pll_data);
>  }
>  

IMHO calles the iounmap() need no check for NULL.

re,
 wh