[PATCH] Mtd: nand - Fix possible NULL derefrence.

Shailendra Verma shailendra.v at samsung.com
Sun Jan 29 20:46:52 PST 2017


of_match_device could return NULL, and so can cause a NULL
pointer dereference later.

Signed-off-by: Shailendra Verma <shailendra.v at samsung.com>
---
 drivers/mtd/nand/mxc_nand.c  |    4 ++++
 drivers/mtd/nand/vf610_nfc.c |    4 ++++
 2 files changed, 8 insertions(+)

diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index d7f724b..ca1b8ad 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -1596,6 +1596,10 @@ static int __init mxcnd_probe_dt(struct mxc_nand_host *host)
 	if (!np)
 		return 1;
 
+	if (!of_id) {
+		dev_err(host->dev, "Error: No device match found\n");
+		return -ENODEV;
+	}
 	host->devtype_data = of_id->data;
 
 	return 0;
diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c
index 3ad514c..0e09c11 100644
--- a/drivers/mtd/nand/vf610_nfc.c
+++ b/drivers/mtd/nand/vf610_nfc.c
@@ -674,6 +674,10 @@ static int vf610_nfc_probe(struct platform_device *pdev)
 	}
 
 	of_id = of_match_device(vf610_nfc_dt_ids, &pdev->dev);
+	if (!of_id) {
+		dev_err(&pdev->dev, "Error: No device match found\n");
+		return -ENODEV;
+	}
 	nfc->variant = (enum vf610_nfc_variant)of_id->data;
 
 	for_each_available_child_of_node(nfc->dev->of_node, child) {
-- 
1.7.9.5




More information about the linux-mtd mailing list