[PATCH] Drivers: pcmcia: Fix memroy leak in sa11xx_drv_pcmcia_probe()

2015-04-22 Thread Firo Yang
From: Firo Yang fir...@gmail.com

Allocated clk was never freed if kzalloc() failed to alloc memory
for skt_dev_info *sinfo. So just free clk when kzalloc() failed.

Signed-off-by: Firo Yang fir...@gmail.com
---
 drivers/pcmcia/sa11xx_base.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c
index cf6de2c..e36ab17 100644
--- a/drivers/pcmcia/sa11xx_base.c
+++ b/drivers/pcmcia/sa11xx_base.c
@@ -229,8 +229,10 @@ int sa11xx_drv_pcmcia_probe(struct device *dev, struct 
pcmcia_low_level *ops,
sa11xx_drv_pcmcia_ops(ops);
 
sinfo = kzalloc(SKT_DEV_INFO_SIZE(nr), GFP_KERNEL);
-   if (!sinfo)
+   if (!sinfo) {
+   clk_put(clk);
return -ENOMEM;
+   }
 
sinfo-nskt = nr;
sinfo-clk = clk;
-- 
2.1.0


___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia


Re: [PATCH] Drivers: pcmcia: Fix memroy leak in sa11xx_drv_pcmcia_probe()

2015-04-22 Thread Russell King - ARM Linux
On Wed, Apr 22, 2015 at 04:25:48PM +0800, Firo Yang wrote:
 From: Firo Yang fir...@gmail.com
 
 Allocated clk was never freed if kzalloc() failed to alloc memory
 for skt_dev_info *sinfo. So just free clk when kzalloc() failed.

A similar patch was posted in March, and in March I posted a series
which addresses this in a better manner.

See the thread starting with message id
20150326112254.gz8...@n2100.arm.linux.org.uk

-- 
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.

___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia