[PATCH 3/5] fpga: altera-hps2fpga: add NULL check on of_match_device() return value

From: Alan Tull
Date: Tue Aug 01 2017 - 22:21:51 EST


From: "Gustavo A. R. Silva" <garsilva@xxxxxxxxxxxxxx>

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 <garsilva@xxxxxxxxxxxxxx>
Reviewed-by: Moritz Fischer <mdf@xxxxxxxxxx>
Signed-off-by: Alan Tull <atull@xxxxxxxxxx>
---
drivers/fpga/altera-hps2fpga.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/drivers/fpga/altera-hps2fpga.c b/drivers/fpga/altera-hps2fpga.c
index a18ff43..e6c948b 100644
--- a/drivers/fpga/altera-hps2fpga.c
+++ b/drivers/fpga/altera-hps2fpga.c
@@ -143,6 +143,11 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
int ret;

of_id = of_match_device(altera_fpga_of_match, dev);
+ if (!of_id) {
+ dev_err(dev, "failed to match device\n");
+ return -ENODEV;
+ }
+
priv = (struct altera_hps2fpga_data *)of_id->data;

priv->bridge_reset = of_reset_control_get_exclusive_by_index(dev->of_node,
--
2.7.4