From: Vitalii Demianets <vitas@nppfactor.kiev.ua>
To: linux-kernel@vger.kernel.org
Cc: "Hans J. Koch" <hjk@hansjkoch.de>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>
Subject: [PATCH] drivers/uio/uio_pdrv_genirq.c: Fix memory leak & confusing labels
Date: Tue, 27 Nov 2012 19:29:32 +0200 [thread overview]
Message-ID: <201211271929.32315.vitas@nppfactor.kiev.ua> (raw)
Memory leak was caused by jumping to the wrong exit label. So, it is good time
to improve misleading label names too.
Signed-off-by: Vitalii Demianets <vitas@nppfactor.kiev.ua>
---
drivers/uio/uio_pdrv_genirq.c | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index 42202cd..b88cf7b 100644
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -110,7 +110,7 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
if (!uioinfo) {
ret = -ENOMEM;
dev_err(&pdev->dev, "unable to kmalloc\n");
- goto bad2;
+ goto out;
}
uioinfo->name = pdev->dev.of_node->name;
uioinfo->version = "devicetree";
@@ -125,20 +125,20 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
if (!uioinfo || !uioinfo->name || !uioinfo->version) {
dev_err(&pdev->dev, "missing platform_data\n");
- goto bad0;
+ goto out_uioinfo;
}
if (uioinfo->handler || uioinfo->irqcontrol ||
uioinfo->irq_flags & IRQF_SHARED) {
dev_err(&pdev->dev, "interrupt configuration error\n");
- goto bad0;
+ goto out_uioinfo;
}
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv) {
ret = -ENOMEM;
dev_err(&pdev->dev, "unable to kmalloc\n");
- goto bad0;
+ goto out_uioinfo;
}
priv->uioinfo = uioinfo;
@@ -150,7 +150,7 @@ static int uio_pdrv_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 out_priv;
}
uioinfo->irq = ret;
}
@@ -205,19 +205,20 @@ static int uio_pdrv_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");
- goto bad1;
+ goto out_pm;
}
platform_set_drvdata(pdev, priv);
return 0;
- bad1:
- kfree(priv);
+out_pm:
pm_runtime_disable(&pdev->dev);
- bad0:
+out_priv:
+ kfree(priv);
+out_uioinfo:
/* kfree uioinfo for OF */
if (pdev->dev.of_node)
kfree(uioinfo);
- bad2:
+out:
return ret;
}
--
1.7.8.6
next reply other threads:[~2012-11-27 17:29 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-27 17:29 Vitalii Demianets [this message]
2012-11-27 23:07 ` Hans J. Koch
2012-11-28 0:07 ` Cong Ding
2012-11-28 0:37 ` Hans J. Koch
2012-11-28 9:29 ` Cong Ding
2012-11-28 21:09 ` Hans J. Koch
2012-11-28 9:37 ` Vitalii Demianets
2012-11-28 21:14 ` Hans J. Koch
2012-11-29 11:47 ` [PATCH] drivers/uio/uio_pdrv_genirq.c: Fix memory freeing issues Vitalii Demianets
2012-12-04 21:04 ` Hans J. Koch
2012-12-05 9:22 ` [PATCH v2] " Vitalii Demianets
2012-12-06 2:41 ` Hans J. Koch
2012-12-06 9:11 ` Vitalii Demianets
2012-12-06 22:15 ` Hans J. Koch
2012-12-07 9:41 ` Vitalii Demianets
2012-12-07 13:51 ` Vitalii Demianets
2012-12-07 15:00 ` Vitalii Demianets
2012-12-07 23:47 ` Hans J. Koch
2012-12-10 9:03 ` Vitalii Demianets
2012-12-10 9:52 ` Hans J. Koch
2012-12-10 10:24 ` Vitalii Demianets
2012-12-10 22:37 ` Hans J. Koch
2012-12-11 10:47 ` Vitalii Demianets
2012-12-13 17:11 ` Hans J. Koch
2012-12-13 17:23 ` Vitalii Demianets
2012-12-13 17:34 ` Hans J. Koch
2012-12-13 18:00 ` Vitalii Demianets
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201211271929.32315.vitas@nppfactor.kiev.ua \
--to=vitas@nppfactor.kiev.ua \
--cc=gregkh@linuxfoundation.org \
--cc=hjk@hansjkoch.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®