From e92e44787763f006911fe09adccfa285f9c7b8d7 Mon Sep 17 00:00:00 2001 From: LABBE Corentin Date: Wed, 24 Aug 2016 10:17:17 +0200 Subject: [PATCH] gpu: ipu-v3: fix a possible NULL dereference of_match_device could return NULL, and so cause a NULL pointer dereference later. For fixing this problem, we use of_device_get_match_data(), this will simplify the code a little by using a standard function for getting the match data. Testing the return value of of_device_get_match_data is also necessary for avoiding a second NULL deref later on devtype. Signed-off-by: LABBE Corentin Signed-off-by: Philipp Zabel --- drivers/gpu/ipu-v3/ipu-common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c index 891cbefe2ad4..e5285d23eed7 100644 --- a/drivers/gpu/ipu-v3/ipu-common.c +++ b/drivers/gpu/ipu-v3/ipu-common.c @@ -1355,8 +1355,6 @@ EXPORT_SYMBOL_GPL(ipu_dump); static int ipu_probe(struct platform_device *pdev) { - const struct of_device_id *of_id = - of_match_device(imx_ipu_dt_ids, &pdev->dev); struct device_node *np = pdev->dev.of_node; struct ipu_soc *ipu; struct resource *res; @@ -1364,7 +1362,9 @@ static int ipu_probe(struct platform_device *pdev) int i, ret, irq_sync, irq_err; const struct ipu_devtype *devtype; - devtype = of_id->data; + devtype = of_device_get_match_data(&pdev->dev); + if (!devtype) + return -EINVAL; irq_sync = platform_get_irq(pdev, 0); irq_err = platform_get_irq(pdev, 1); -- GitLab