linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v4 -next] mtd: docg3: fix a possible memory leak of mtd->name
@ 2019-01-25  2:12 YueHaibing
  2019-01-28  9:36 ` [v4,-next] " Boris Brezillon
  0 siblings, 1 reply; 2+ messages in thread
From: YueHaibing @ 2019-01-25  2:12 UTC (permalink / raw)
  To: robert.jarzmik, dwmw2, computersforpeace, bbrezillon,
	marek.vasut, richard
  Cc: linux-kernel, linux-mtd, YueHaibing

In case DOC_CHIPID_G3, mtd->name is not freed in err handling path,
which is alloced by kasprintf(). Fix this by using devm_kasprintf().

Fixes: ae9d4934b2d7 ("mtd: docg3: add multiple floor support")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
v4: remove 'kfree' in remove patch
v3: use devm_kasprintf
---
 drivers/mtd/devices/docg3.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c
index 4c94fc0..ffd5ed5 100644
--- a/drivers/mtd/devices/docg3.c
+++ b/drivers/mtd/devices/docg3.c
@@ -1767,8 +1767,8 @@ static int __init doc_set_driver_info(int chip_id, struct mtd_info *mtd)
 
 	switch (chip_id) {
 	case DOC_CHIPID_G3:
-		mtd->name = kasprintf(GFP_KERNEL, "docg3.%d",
-				      docg3->device_id);
+		mtd->name = devm_kasprintf(docg3->dev, GFP_KERNEL, "docg3.%d",
+					   docg3->device_id);
 		if (!mtd->name)
 			return -ENOMEM;
 		docg3->max_block = 2047;
@@ -1886,7 +1886,6 @@ static void doc_release_device(struct mtd_info *mtd)
 	mtd_device_unregister(mtd);
 	kfree(docg3->bbt);
 	kfree(docg3);
-	kfree(mtd->name);
 	kfree(mtd);
 }
 
-- 
2.7.0



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [v4,-next] mtd: docg3: fix a possible memory leak of mtd->name
  2019-01-25  2:12 [PATCH v4 -next] mtd: docg3: fix a possible memory leak of mtd->name YueHaibing
@ 2019-01-28  9:36 ` Boris Brezillon
  0 siblings, 0 replies; 2+ messages in thread
From: Boris Brezillon @ 2019-01-28  9:36 UTC (permalink / raw)
  To: YueHaibing, robert.jarzmik, dwmw2, computersforpeace, bbrezillon,
	marek.vasut, richard
  Cc: linux-mtd, linux-kernel

On Fri, 2019-01-25 at 02:12:42 UTC, YueHaibing wrote:
> In case DOC_CHIPID_G3, mtd->name is not freed in err handling path,
> which is alloced by kasprintf(). Fix this by using devm_kasprintf().
> 
> Fixes: ae9d4934b2d7 ("mtd: docg3: add multiple floor support")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>

Applied to http://git.infradead.org/linux-mtd.git mtd/next, thanks.

Boris

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-01-28  9:36 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-25  2:12 [PATCH v4 -next] mtd: docg3: fix a possible memory leak of mtd->name YueHaibing
2019-01-28  9:36 ` [v4,-next] " Boris Brezillon

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).