Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1701635

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

Show all headers | View raw

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

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>
---
 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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/5] patches for FPGA Alan Tull <atull@kernel.org> - 2017-08-02 04:30 +0200
  [PATCH 5/5] MAINTAINERS: fpga: Update email and add patchwork URL Alan Tull <atull@kernel.org> - 2017-08-02 04:30 +0200
  [PATCH 1/5] fpga: Convert to using %pOF instead of full_name Alan Tull <atull@kernel.org> - 2017-08-02 04:30 +0200
  [PATCH 3/5] fpga: altera-hps2fpga: add NULL check on of_match_device() return value Alan Tull <atull@kernel.org> - 2017-08-02 04:30 +0200
  [PATCH 2/5] ARM: socfpga: explicitly request exclusive reset control Alan Tull <atull@kernel.org> - 2017-08-02 04:30 +0200
  [PATCH 4/5] fpga: altera-hps2fpga: fix multiple init of l3_remap_lock Alan Tull <atull@kernel.org> - 2017-08-02 04:30 +0200

csiph-web