From: Elias Oltmanns <eo@nebensachen.de>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>,
Jeff Garzik <jeff@garzik.org>,
Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>,
James Bottomley <James.Bottomley@hansenpartnership.com>
Cc: Pavel Machek <pavel@ucw.cz>,
linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/5] Make sure that ata_force_tbl is freed in case of an error
Date: Sat, 26 Jul 2008 08:23:23 +0200 [thread overview]
Message-ID: <20080726062141.29070.75212.stgit@denkblock.local> (raw)
In-Reply-To: <87prp1kvyy.fsf@denkblock.local>
This is just a trivial fix of a potential memory leak when ata_init()
encounters an error.
Signed-off-by: Elias Oltmanns <eo@nebensachen.de>
---
drivers/ata/libata-core.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 9bef1a8..0a2f921 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -6088,16 +6088,20 @@ static int __init ata_init(void)
ata_wq = create_workqueue("ata");
if (!ata_wq)
- return -ENOMEM;
+ goto free_force_tbl;
ata_aux_wq = create_singlethread_workqueue("ata_aux");
- if (!ata_aux_wq) {
- destroy_workqueue(ata_wq);
- return -ENOMEM;
- }
+ if (!ata_aux_wq)
+ goto free_wq;
printk(KERN_DEBUG "libata version " DRV_VERSION " loaded.\n");
return 0;
+
+free_wq:
+ destroy_workqueue(ata_wq);
+free_force_tbl:
+ kfree(ata_force_tbl);
+ return -ENOMEM;
}
static void __exit ata_exit(void)
next prev parent reply other threads:[~2008-07-26 6:23 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-26 6:20 [RFC] Disk shock protection in GNU/Linux Elias Oltmanns
2008-07-26 6:23 ` Elias Oltmanns [this message]
2008-07-26 6:24 ` [PATCH 2/5] Introduce ata_id_has_unload() Elias Oltmanns
2008-07-26 16:01 ` Alan Cox
2008-07-26 6:25 ` [PATCH 3/5] libata: Implement disk shock protection support Elias Oltmanns
2008-08-01 7:19 ` Tejun Heo
2008-08-01 22:34 ` Alan Cox
2008-08-03 3:19 ` Tejun Heo
2008-08-03 13:05 ` Alan Cox
2008-08-03 13:58 ` Tejun Heo
2008-08-04 13:43 ` Elias Oltmanns
2008-08-04 13:26 ` Elias Oltmanns
2008-08-04 14:12 ` Tejun Heo
2008-08-04 16:54 ` Elias Oltmanns
2008-08-04 23:26 ` Tejun Heo
2008-08-04 14:28 ` Gabor Gombas
2008-08-04 14:13 ` Alan Cox
2008-08-04 14:35 ` Tejun Heo
2008-07-26 6:27 ` [PATCH 4/5] ide: " Elias Oltmanns
2008-08-04 6:39 ` Pavel Machek
2008-08-04 14:15 ` Elias Oltmanns
2008-07-26 6:29 ` [PATCH 5/5] Add documentation for hard disk shock protection interface Elias Oltmanns
2008-07-26 9:18 ` Sergei Shtylyov
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=20080726062141.29070.75212.stgit@denkblock.local \
--to=eo@nebensachen.de \
--cc=James.Bottomley@hansenpartnership.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=bzolnier@gmail.com \
--cc=jeff@garzik.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@ucw.cz \
/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;
as well as URLs for NNTP newsgroup(s).