diff options
| author | Richard Weinberger <richard@nod.at> | 2015-06-01 23:10:51 +0200 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-06-17 03:58:47 +0200 |
| commit | bc349da0a6b3c6cf795b6a51e3f448d9d16a1686 (patch) | |
| tree | 4d2d1c24a9171267545f139053be9d42ae8489ee /drivers/mtd | |
| parent | mtd: r852: Fix device_create_file() usage (diff) | |
| download | linux-bc349da0a6b3c6cf795b6a51e3f448d9d16a1686.tar.xz linux-bc349da0a6b3c6cf795b6a51e3f448d9d16a1686.zip | |
mtd: cs553x_nand: Fix kasprintf() usage
kasprintf() does a dynamic memory allocation and can fail.
We have to handle that case.
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/cs553x_nand.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c index 88109d375ae7..aec6045058c7 100644 --- a/drivers/mtd/nand/cs553x_nand.c +++ b/drivers/mtd/nand/cs553x_nand.c @@ -237,17 +237,23 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr) /* Enable the following for a flash based bad block table */ this->bbt_options = NAND_BBT_USE_FLASH; + new_mtd->name = kasprintf(GFP_KERNEL, "cs553x_nand_cs%d", cs); + if (!new_mtd->name) { + err = -ENOMEM; + goto out_ior; + } + /* Scan to find existence of the device */ if (nand_scan(new_mtd, 1)) { err = -ENXIO; - goto out_ior; + goto out_free; } - new_mtd->name = kasprintf(GFP_KERNEL, "cs553x_nand_cs%d", cs); - cs553x_mtd[cs] = new_mtd; goto out; +out_free: + kfree(new_mtd->name); out_ior: iounmap(this->IO_ADDR_R); out_mtd: |