linux-kernel - Re: [PATCH] usb: host: ohci-pxa27x: Handle return value of clk_prepare

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]

Date:   Wed, 14 Jun 2017 10:29:40 -0400 (EDT)
From:   Alan Stern <stern@...land.harvard.edu>
To:     Arvind Yadav <arvind.yadav.cs@...il.com>
cc:     gregkh@...uxfoundation.org, <linux-usb@...r.kernel.org>,
        <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] usb: host: ohci-pxa27x: Handle return value of
 clk_prepare_enable

On Wed, 14 Jun 2017, Arvind Yadav wrote:

> clk_prepare_enable() can fail here and we must check its return value.
> 
> Signed-off-by: Arvind Yadav <arvind.yadav.cs@...il.com>
> ---
>  drivers/usb/host/ohci-pxa27x.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
> index 79efde8f..c5afdb2 100644
> --- a/drivers/usb/host/ohci-pxa27x.c
> +++ b/drivers/usb/host/ohci-pxa27x.c
> @@ -281,7 +281,9 @@ static int pxa27x_start_hc(struct pxa27x_ohci *pxa_ohci, struct device *dev)
>  
>  	inf = dev_get_platdata(dev);
>  
> -	clk_prepare_enable(pxa_ohci->clk);
> +	retval = clk_prepare_enable(pxa_ohci->clk);
> +	if (retval)
> +		return retval;

You might as well remove the initializer for retval ("int retval = 0;") 
because the initial value will always be overwritten here.

>  
>  	pxa27x_reset_hc(pxa_ohci);
>  
> @@ -296,8 +298,10 @@ static int pxa27x_start_hc(struct pxa27x_ohci *pxa_ohci, struct device *dev)
>  	if (inf->init)
>  		retval = inf->init(dev);
>  
> -	if (retval < 0)
> +	if (retval < 0) {
> +		clk_disable_unprepare(pxa_ohci->clk);
>  		return retval;
> +	}
>  
>  	if (cpu_is_pxa3xx())
>  		pxa3xx_u2d_start_hc(&hcd->self);

Aside from that one issue,

Acked-by: Alan Stern <stern@...land.harvard.edu>

Alan Stern