diff options
| author | YueHaibing <yuehaibing@huawei.com> | 2019-01-25 10:12:42 +0800 |
|---|---|---|
| committer | Boris Brezillon <bbrezillon@kernel.org> | 2019-01-29 15:09:16 +0100 |
| commit | b0dd77a796423ad3c609b6708260adca85a0798f (patch) | |
| tree | 2f79b71fb07a2db8388bf6566321fa899f843e9a /drivers/mtd/devices/docg3.c | |
| parent | f7fd818cca0cea3d678f19cd300f06a537ae9e90 (diff) | |
| download | linux-stable-b0dd77a796423ad3c609b6708260adca85a0798f.tar.gz linux-stable-b0dd77a796423ad3c609b6708260adca85a0798f.tar.bz2 linux-stable-b0dd77a796423ad3c609b6708260adca85a0798f.zip | |
mtd: docg3: fix a possible memory leak of mtd->name
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>
Signed-off-by: Boris Brezillon <bbrezillon@kernel.org>
Diffstat (limited to 'drivers/mtd/devices/docg3.c')
| -rw-r--r-- | drivers/mtd/devices/docg3.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c index 60ddc38a5431..7754803e3463 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); } |