linux-kernel - Re: [PATCH RESEND] ARM: pxa: fix error handling in pxa2xx_drv_pcmcia

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]

Date:	Tue, 27 Dec 2011 16:24:33 +0100
From:	Marek Vasut <marek.vasut@...il.com>
To:	linux-arm-kernel@...ts.infradead.org
Cc:	Axel Lin <axel.lin@...il.com>, linux-kernel@...r.kernel.org,
	Russell King <linux@....linux.org.uk>,
	linux-pcmcia@...ts.infradead.org,
	Eric Miao <eric.y.miao@...il.com>,
	Haojian Zhuang <haojian.zhuang@...vell.com>
Subject: Re: [PATCH RESEND] ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe

> If pxa2xx_drv_pcmcia_add_one fails, it will go to err1 error path.
> Add a missing clk_put in the error path.
> 
> Checking the ret value after the for loop is redundant, it is always false.
> Thus remove the redundant checking.
> 
> Signed-off-by: Axel Lin <axel.lin@...il.com>
> ---
>  drivers/pcmcia/pxa2xx_base.c |   12 +++---------
>  1 files changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
> index a87e272..64d433e 100644
> --- a/drivers/pcmcia/pxa2xx_base.c
> +++ b/drivers/pcmcia/pxa2xx_base.c
> @@ -328,21 +328,15 @@ static int pxa2xx_drv_pcmcia_probe(struct
> platform_device *dev) goto err1;
>  	}
> 
> -	if (ret) {
> -		while (--i >= 0)
> -			soc_pcmcia_remove_one(&sinfo->skt[i]);
> -		kfree(sinfo);
> -		clk_put(clk);
> -	} else {
> -		pxa2xx_configure_sockets(&dev->dev);
> -		dev_set_drvdata(&dev->dev, sinfo);
> -	}
> +	pxa2xx_configure_sockets(&dev->dev);
> +	dev_set_drvdata(&dev->dev, sinfo);
> 
>  	return 0;
> 
>  err1:
>  	while (--i >= 0)
>  		soc_pcmcia_remove_one(&sinfo->skt[i]);
> +	clk_put(clk);
>  	kfree(sinfo);
>  err0:
>  	return ret;

Makes sense

Acked-by: Marek Vasut <marek.vasut@...il.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/