nvmem: imx-ocotp: add NULL check on of_match_device() return value

PATCH New Gustavo A. R. Silva 1 participant 1 message Jul 7, 2017

Subsystems (2)

Arm i.MX and Layerscape NVMEM framework

lore

Share & tools

lore

Gustavo A. R. Silva

author

2017-07-07 07:05 UTC #0 lore raw

PATCH 1/1 nvmem: imx-ocotp: add NULL check on of_match_device() return value

Check return value from call to of_match_device()
in order to prevent a NULL pointer dereference.

In case of NULL print error message and return -ENODEV

Signed-off-by Gustavo A. R. Silva <[email protected]>

---
 drivers/nvmem/imx-ocotp.c | 5 +++++
 1 file changed, 5 insertions(+)

drivers/nvmem/imx-ocotp.c +5 -0

index 193ca8f..caa18cd 100644
@@ -342,6 +342,11 @@ static int imx_ocotp_probe(struct platform_device *pdev)
 		return PTR_ERR(priv->clk);
 
 	of_id = of_match_device(imx_ocotp_dt_ids, dev);
+	if (!of_id) {
+		dev_err(dev, "failed to match device\n");
+		return -ENODEV;
+	}
+
 	priv->nregs = (unsigned long)of_id->data;
 	imx_ocotp_nvmem_config.size = 4 * priv->nregs;
 	imx_ocotp_nvmem_config.dev = dev;

Signature · 1 line

2.5.0