linux-kernel - Re: [PATCH 8/9] watchdog: of_xilinx

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: <fdb88aa1-35a5-d971-23b1-457354f4c3f1@roeck-us.net>
Date:   Mon, 15 Mar 2021 19:33:34 -0700
From:   Guenter Roeck <linux@...ck-us.net>
To:     Srinivas Neeli <srinivas.neeli@...inx.com>,
        michal.simek@...inx.com, shubhrajyoti.datta@...inx.com,
        sgoud@...inx.com
Cc:     wim@...ux-watchdog.org, linux-watchdog@...r.kernel.org,
        linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
        git@...inx.com
Subject: Re: [PATCH 8/9] watchdog: of_xilinx_wdt: Remove passing null pointer

On 3/15/21 3:46 AM, Srinivas Neeli wrote:
> clk is an optional property, if clock not defined,
> calling clk_prepare_enable() and devm_add_action_or_reset()
> are not useful.
> so calling these two apis only when clock is present.
> 
> Addresses-Coverity:"FORWARD_NULL"
> 
> Signed-off-by: Srinivas Neeli <srinivas.neeli@...inx.com>

Reviewed-by: Guenter Roeck <linux@...ck-us.net>

> ---
>  drivers/watchdog/of_xilinx_wdt.c | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c
> index 3656e716b4f7..ad35c93b7684 100644
> --- a/drivers/watchdog/of_xilinx_wdt.c
> +++ b/drivers/watchdog/of_xilinx_wdt.c
> @@ -520,6 +520,16 @@ static int xwdt_probe(struct platform_device *pdev)
>  				 "The watchdog clock freq cannot be obtained\n");
>  	} else {
>  		pfreq = clk_get_rate(xdev->clk);
> +		rc = clk_prepare_enable(xdev->clk);
> +
> +		if (rc) {
> +			dev_err(dev, "unable to enable clock\n");
> +			return rc;
> +		}
> +		rc = devm_add_action_or_reset(dev, xwdt_clk_disable_unprepare,
> +					      xdev->clk);
> +		if (rc)
> +			return rc;
>  	}
>  
>  	if (wdttype == XWDT_WDT) {
> @@ -554,16 +564,6 @@ static int xwdt_probe(struct platform_device *pdev)
>  	spin_lock_init(&xdev->spinlock);
>  	watchdog_set_drvdata(xilinx_wdt_wdd, xdev);
>  
> -	rc = clk_prepare_enable(xdev->clk);
> -	if (rc) {
> -		dev_err(dev, "unable to enable clock\n");
> -		return rc;
> -	}
> -	rc = devm_add_action_or_reset(dev, xwdt_clk_disable_unprepare,
> -				      xdev->clk);
> -	if (rc)
> -		return rc;
> -
>  	if (wdttype == XWDT_WDT) {
>  		rc = xwdt_selftest(xdev);
>  		if (rc == XWT_TIMER_FAILED) {
>