Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <6e0029f6-f499-c688-9174-61409180eae5@gmail.com>
Date:   Sun, 15 May 2022 22:35:47 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.4.0
Subject: Re: [PATCH] ep93xx: clock: Do not return the address of the freed
 memory
Content-Language: en-US
To:     Genjian Zhang <zhanggenjian123@gmail.com>,
        hsweeten@visionengravers.com, linux@armlinux.org.uk
Cc:     linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        Genjian Zhang <zhanggenjian@kylinos.cn>
References: <20220512075943.2397833-1-zhanggenjian@kylinos.cn>
From:   Alexander Sverdlin <alexander.sverdlin@gmail.com>
In-Reply-To: <20220512075943.2397833-1-zhanggenjian@kylinos.cn>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

Hello Genjian!

Thank you for the patch!

On 12/05/2022 09:59, Genjian Zhang wrote:
> Although there will be basic judgments of IS_ERR() on this return value
> elsewhere,but I think it can be replaced by the actual error return
> value of clk_register.

Actually this fixes very similar use-after-free which I missed in
commit 9645ccc7bd7a1.

I propose to add
Fixes: 9645ccc7bd7a1 ("ep93xx: clock: convert in-place to COMMON_CLK")

> Signed-off-by: Genjian Zhang <zhanggenjian@kylinos.cn>
> ---
>  arch/arm/mach-ep93xx/clock.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c
> index 4fa6ea5461b7..762328de4bce 100644
> --- a/arch/arm/mach-ep93xx/clock.c
> +++ b/arch/arm/mach-ep93xx/clock.c
> @@ -345,9 +345,10 @@ static struct clk_hw *clk_hw_register_ddiv(const char *name,
>  	psc->hw.init = &init;
>  
>  	clk = clk_register(NULL, &psc->hw);
> -	if (IS_ERR(clk))
> +	if (IS_ERR(clk)) {
>  		kfree(psc);
> -
> +		return (struct clk_hw *)clk;

Could you please use ERR_CAST()?

> +	}
>  	return &psc->hw;
>  }
>  
> @@ -452,9 +453,10 @@ static struct clk_hw *clk_hw_register_div(const char *name,
>  	psc->hw.init = &init;
>  
>  	clk = clk_register(NULL, &psc->hw);
> -	if (IS_ERR(clk))
> +	if (IS_ERR(clk)) {
>  		kfree(psc);
> -
> +		return (struct clk_hw *)clk;

same as above

> +	}
>  	return &psc->hw;
>  }
>