aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>2009-06-09 14:31:15 +0100
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-06-09 14:31:15 +0100
commit272023df26da2668ecc3937f8eeb48c8683b64fa (patch)
treef81ad995768fa5b52d30ddc37b60c0db58771ba0
parentbfee1a4311702c9fdecd8264ffd1126fd0ce92fb (diff)
mtd: nand: Fix memory leak on txx9ndfmc probe failure.
Commit 81933046ef2a615031c46171013bde2c5225ee69 ('mtd: Fix handling of mtdname in txx9ndfmc.c') introduced a potential memory leak. The 'mtdname' member of the private data structure is now allocated separately, but was not freed on certain error paths. Fix that, and make things simpler by _always_ allocating it separately so that we don't need 'if (mtdname != dev_name()) kfree(mtdname);'... which gets ugly now that we're doing it more than once, and more likely that we'll get it wrong some time. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/mtd/nand/txx9ndfmc.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
index 5f919e63b29..488088eff2c 100644
--- a/drivers/mtd/nand/txx9ndfmc.c
+++ b/drivers/mtd/nand/txx9ndfmc.c
@@ -336,20 +336,21 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)
txx9_priv->cs = i;
txx9_priv->mtdname = kasprintf(GFP_KERNEL, "%s.%u",
dev_name(&dev->dev), i);
- if (!txx9_priv->mtdname) {
- kfree(txx9_priv);
- dev_err(&dev->dev,
- "Unable to allocate TXx9 NDFMC MTD device name.\n");
- continue;
- }
} else {
txx9_priv->cs = -1;
- txx9_priv->mtdname = dev_name(&dev->dev);
+ txx9_priv->mtdname = kstrdup(dev_name(&dev->dev),
+ GFP_KERNEL);
+ }
+ if (!txx9_priv->mtdname) {
+ kfree(txx9_priv);
+ dev_err(&dev->dev, "Unable to allocate MTD name.\n");
+ continue;
}
if (plat->wide_mask & (1 << i))
chip->options |= NAND_BUSWIDTH_16;
if (nand_scan(mtd, 1)) {
+ kfree(txx9_priv->mtdname);
kfree(txx9_priv);
continue;
}
@@ -391,8 +392,7 @@ static int __exit txx9ndfmc_remove(struct platform_device *dev)
kfree(drvdata->parts[i]);
#endif
del_mtd_device(mtd);
- if (txx9_priv->mtdname != dev_name(&dev->dev))
- kfree(txx9_priv->mtdname);
+ kfree(txx9_priv->mtdname);
kfree(txx9_priv);
}
return 0;