summaryrefslogtreecommitdiffstats
path: root/drivers/fpga
diff options
context:
space:
mode:
authorGustavo A. R. Silva <garsilva@embeddedor.com>2017-08-01 21:20:53 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-10 14:27:55 -0700
commit26ffca5ec406213da347cd3c5858d1414943caea (patch)
tree2774e8898d0808f219b6627f6243507111e29e72 /drivers/fpga
parent4fd72fd29d4a90d9117038f4e15e4073aeb3bf7f (diff)
downloadlinux-26ffca5ec406213da347cd3c5858d1414943caea.tar.bz2
fpga: altera-hps2fpga: 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 <garsilva@embeddedor.com> Reviewed-by: Moritz Fischer <mdf@kernel.org> Signed-off-by: Alan Tull <atull@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/fpga')
-rw-r--r--drivers/fpga/altera-hps2fpga.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/fpga/altera-hps2fpga.c b/drivers/fpga/altera-hps2fpga.c
index a18ff430c9af..e6c948b31474 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,