mtd: nand: Fix memory leak on txx9ndfmc probe failure. (272023df) · Commits · 戴 / test

Commit ('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>

drivers/mtd/nand/txx9ndfmc.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -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);
		} else {
		txx9_priv->cs = -1;
		txx9_priv->mtdname = kstrdup(dev_name(&dev->dev),
		GFP_KERNEL);
		}
		if (!txx9_priv->mtdname) {
		kfree(txx9_priv);
		dev_err(&dev->dev,
		"Unable to allocate TXx9 NDFMC MTD device name.\n");
		dev_err(&dev->dev, "Unable to allocate MTD name.\n");
		continue;
		}
		} else {
		txx9_priv->cs = -1;
		txx9_priv->mtdname = dev_name(&dev->dev);
		}
		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,7 +392,6 @@ 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);
		}

Admin message