Thread (4 messages) flat view 4 messages, 3 authors, 2021-06-02

RE: [PATCH -next] soc: imx: gpc: add check for of_match_device in imx_gpc_old_dt_init

From: Jacky Bai <ping.bai@nxp.com>
Date: 2021-06-01 10:11:43
Also in: lkml

quoted hunk ↗ jump to hunk
Subject: [PATCH -next] soc: imx: gpc: add check for of_match_device in
imx_gpc_old_dt_init

Add check for of_match_device in imx_gpc_old_dt_init to avoid potential
NULL dereference of of_id.

Signed-off-by: Tong Tiangen <redacted>
---
 drivers/soc/imx/gpc.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/soc/imx/gpc.c b/drivers/soc/imx/gpc.c index
90a8b2c0676f..017a5e2bd4e6 100644
--- a/drivers/soc/imx/gpc.c
+++ b/drivers/soc/imx/gpc.c
@@ -403,14 +403,25 @@ static int imx_gpc_old_dt_init(struct device *dev,
struct regmap *regmap,

 static int imx_gpc_probe(struct platform_device *pdev)  {
-	const struct of_device_id *of_id =
-			of_match_device(imx_gpc_dt_ids, &pdev->dev);
-	const struct imx_gpc_dt_data *of_id_data = of_id->data;
+	const struct of_device_id *of_id;
+	const struct imx_gpc_dt_data *of_id_data;
 	struct device_node *pgc_node;
 	struct regmap *regmap;
 	void __iomem *base;
 	int ret;

+	of_id = of_match_device(imx_gpc_dt_ids, &pdev->dev);
+	if (!of_id) {
+		dev_err(&pdev->dev, "OF id missing\n");
+		return -EINVAL;
+	}
+
+	of_id_data = of_id->data;
+	if (!of_id_data) {
+		dev_err(&pdev->dev, "OF id data missing\n");
+		return -EINVAL;
+	}
+
I think there is no chance to pass 'invalid of_id' and 'of_id_data' to the probe function.
Such check seems not really necessary.

BR
Jacky Bai
 	pgc_node = of_get_child_by_name(pdev->dev.of_node, "pgc");

 	/* bail out if DT too old and doesn't provide the necessary info */
--
2.18.0.huawei.25
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help