* [PATCH revised] mtd: remove driver-core BUS_ID_SIZE
@ 2009-06-06 16:44 Atsushi Nemoto
2009-06-08 8:14 ` David Woodhouse
0 siblings, 1 reply; 3+ messages in thread
From: Atsushi Nemoto @ 2009-06-06 16:44 UTC (permalink / raw)
To: dwmw2; +Cc: Kay Sievers, linux-mtd, Greg Kroah-Hartman
From: Kay Sievers <kay.sievers@vrfy.org>
The name size limit is gone from the driver-core, the BUS_ID_SIZE
value will be removed.
[initial version by kay.sievers, reimplemented by dwmw2, adjusted by anemo]
Cc: dwmw2@infradead.org
Cc: linux-mtd@lists.infradead.org
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
drivers/mtd/nand/txx9ndfmc.c | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
index 8124792..114ac76 100644
--- a/drivers/mtd/nand/txx9ndfmc.c
+++ b/drivers/mtd/nand/txx9ndfmc.c
@@ -64,7 +64,7 @@ struct txx9ndfmc_priv {
struct nand_chip chip;
struct mtd_info mtd;
int cs;
- char mtdname[BUS_ID_SIZE + 2];
+ const char *mtdname;
};
#define MAX_TXX9NDFMC_DEV 4
@@ -334,16 +334,24 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)
if (plat->ch_mask != 1) {
txx9_priv->cs = i;
- sprintf(txx9_priv->mtdname, "%s.%u",
- dev_name(&dev->dev), 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 MTD name.\n");
+ continue;
+ }
} else {
txx9_priv->cs = -1;
- strcpy(txx9_priv->mtdname, dev_name(&dev->dev));
+ txx9_priv->mtdname = kstrdup(dev_name(&dev->dev),
+ GFP_KERNEL);
}
if (plat->wide_mask & (1 << i))
chip->options |= NAND_BUSWIDTH_16;
if (nand_scan(mtd, 1)) {
+ kfree(txx9_priv->mtdname);
kfree(txx9_priv);
continue;
}
@@ -385,6 +393,7 @@ static int __exit txx9ndfmc_remove(struct platform_device *dev)
kfree(drvdata->parts[i]);
#endif
del_mtd_device(mtd);
+ kfree(txx9_priv->mtdname);
kfree(txx9_priv);
}
return 0;
--
1.5.6.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH revised] mtd: remove driver-core BUS_ID_SIZE
2009-06-06 16:44 [PATCH revised] mtd: remove driver-core BUS_ID_SIZE Atsushi Nemoto
@ 2009-06-08 8:14 ` David Woodhouse
2009-06-08 14:34 ` Atsushi Nemoto
0 siblings, 1 reply; 3+ messages in thread
From: David Woodhouse @ 2009-06-08 8:14 UTC (permalink / raw)
To: Atsushi Nemoto; +Cc: Kay Sievers, linux-mtd, Greg Kroah-Hartman
On Sun, 2009-06-07 at 01:44 +0900, Atsushi Nemoto wrote:
> From: Kay Sievers <kay.sievers@vrfy.org>
>
> The name size limit is gone from the driver-core, the BUS_ID_SIZE
> value will be removed.
Thanks. I've already applied the original patch, so I was after an
incremental one.
> txx9_priv->cs = -1;
> - strcpy(txx9_priv->mtdname, dev_name(&dev->dev));
> + txx9_priv->mtdname = kstrdup(dev_name(&dev->dev),
> + GFP_KERNEL);
You don't check for failure here.
With that fixed, this is your changes as an incremental patch with an
appropriate commit log... I think it's exceeded the limit of how much
I'd want to massage your patch while retaining your Signed-off-by:, so
I'll give you a chance to append your S-o-b for yourself....
-----
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Subject: [PATCH] Fix memory leak on 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.
diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
index 5f919e6..488088e 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;
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel.com Intel Corporation
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH revised] mtd: remove driver-core BUS_ID_SIZE
2009-06-08 8:14 ` David Woodhouse
@ 2009-06-08 14:34 ` Atsushi Nemoto
0 siblings, 0 replies; 3+ messages in thread
From: Atsushi Nemoto @ 2009-06-08 14:34 UTC (permalink / raw)
To: dwmw2; +Cc: kay.sievers, linux-mtd, gregkh
On Mon, 08 Jun 2009 09:14:22 +0100, David Woodhouse <dwmw2@infradead.org> wrote:
> > txx9_priv->cs = -1;
> > - strcpy(txx9_priv->mtdname, dev_name(&dev->dev));
> > + txx9_priv->mtdname = kstrdup(dev_name(&dev->dev),
> > + GFP_KERNEL);
>
> You don't check for failure here.
>
> With that fixed, this is your changes as an incremental patch with an
> appropriate commit log... I think it's exceeded the limit of how much
> I'd want to massage your patch while retaining your Signed-off-by:, so
> I'll give you a chance to append your S-o-b for yourself....
Oh, thanks.
> -----
> From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
> Subject: [PATCH] Fix memory leak on 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>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-06-08 14:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-06 16:44 [PATCH revised] mtd: remove driver-core BUS_ID_SIZE Atsushi Nemoto
2009-06-08 8:14 ` David Woodhouse
2009-06-08 14:34 ` Atsushi Nemoto
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.