summaryrefslogtreecommitdiffstats
path: root/drivers/uio
diff options
context:
space:
mode:
authorDaeseok Youn <daeseok.youn@gmail.com>2014-05-22 09:46:12 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-27 14:11:06 -0700
commitca3c61f358d8e5a4b2732d6aa81ac46f677e69f0 (patch)
tree067f59413cfd55aede6c0216018724ebd85194cf /drivers/uio
parenta0f104644ec27ce5bbb36e950eb426dba9a3ad44 (diff)
downloadlinux-ca3c61f358d8e5a4b2732d6aa81ac46f677e69f0.tar.gz
linux-ca3c61f358d8e5a4b2732d6aa81ac46f677e69f0.tar.bz2
linux-ca3c61f358d8e5a4b2732d6aa81ac46f677e69f0.zip
drivers: uio_dmem_genirq: Fix memory leak in uio_dmem_genirq_probe()
When platform_get_irq() is failed after "priv" allocated, it need to free "priv". But the label of bad0 doesn't try to free about "priv". So this patch changes that lable to "bad1". But "bad1" has pm_runtime_disable() call, this function should be called when uio_register_device() is failed. So it is moved into handling error for uio_register_device(). Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com> Signed-off-by: Hans J. Koch <hjk@hansjkoch.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/uio')
-rw-r--r--drivers/uio/uio_dmem_genirq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c
index 1270f3b26139..8d0bba469566 100644
--- a/drivers/uio/uio_dmem_genirq.c
+++ b/drivers/uio/uio_dmem_genirq.c
@@ -204,7 +204,7 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev)
ret = platform_get_irq(pdev, 0);
if (ret < 0) {
dev_err(&pdev->dev, "failed to get IRQ\n");
- goto bad0;
+ goto bad1;
}
uioinfo->irq = ret;
}
@@ -275,6 +275,7 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev)
ret = uio_register_device(&pdev->dev, priv->uioinfo);
if (ret) {
dev_err(&pdev->dev, "unable to register uio device\n");
+ pm_runtime_disable(&pdev->dev);
goto bad1;
}
@@ -282,7 +283,6 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev)
return 0;
bad1:
kfree(priv);
- pm_runtime_disable(&pdev->dev);
bad0:
/* kfree uioinfo for OF */
if (pdev->dev.of_node)