From: Fabio Estevam <fabio.estevam@nxp.com>
Date: Fri, 5 Jan 2018 20:02:56 +0000 (-0200)
Subject: mtd: nand: brcmnand: Add a NULL check for devm_kasprintf()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=039b4377e5621a2cc197a7aff1e06db432e4dcc2;p=openwrt%2Fstaging%2Fblogic.git

mtd: nand: brcmnand: Add a NULL check for devm_kasprintf()

devm_kasprintf() may fail, so we should better add a NULL check
and propagate an error on failure.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
---

diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
index 54842512edb1..e0797abb1ebd 100644
--- a/drivers/mtd/nand/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/brcmnand/brcmnand.c
@@ -2237,6 +2237,9 @@ static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn)
 	nand_set_controller_data(chip, host);
 	mtd->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "brcmnand.%d",
 				   host->cs);
+	if (!mtd->name)
+		return -ENOMEM;
+
 	mtd->owner = THIS_MODULE;
 	mtd->dev.parent = &pdev->dev;