From patchwork Sun Jul 22 06:59:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/2] MTD: check for valid pdata inside plat_nand Date: Sat, 21 Jul 2012 20:59:57 -0000 From: John Crispin X-Patchwork-Id: 172478 Message-Id: <1342940398-2162-1-git-send-email-blogic@openwrt.org> To: Artem Bityutskiy Cc: linux-mtd@lists.infradead.org, John Crispin If plat_nand loads and the platform_data is not properly set it will segfault. Signed-off-by: John Crispin Acked-by: Artem Bityutskiy Cc: linux-mtd@lists.infradead.org --- I am seeing this when plat_nand is referenced inside my DT file but CONFIG_MTD_NAND_XWAY is not selected, resulting in platform_data not being populated with valid data. --- drivers/mtd/nand/plat_nand.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c index 1bcb520..a47ee68 100644 --- a/drivers/mtd/nand/plat_nand.c +++ b/drivers/mtd/nand/plat_nand.c @@ -37,6 +37,11 @@ static int __devinit plat_nand_probe(struct platform_device *pdev) const char **part_types; int err = 0; + if (!pdata) { + dev_err(&pdev->dev, "platform_nand_data is missing\n"); + return -EINVAL; + } + if (pdata->chip.nr_chips < 1) { dev_err(&pdev->dev, "invalid number of chips specified\n"); return -EINVAL;