Ver Fonte

pinctrl: freescale: imx: fix bogus check of of_iomap() return value

On error path of_iomap() returns NULL, hence IS_ERR() check is invalid
and may cause a NULL pointer dereference, the change fixes this
problem.

While we are here invert a device node check to simplify the code.

Fixes: 26d8cde5260b ("pinctrl: freescale: imx: add shared input select reg support")
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Acked-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Vladimir Zapolskiy há 9 anos atrás
pai
commit
9a4f424531
1 ficheiros alterados com 8 adições e 9 exclusões
  1. 8 9
      drivers/pinctrl/freescale/pinctrl-imx.c

+ 8 - 9
drivers/pinctrl/freescale/pinctrl-imx.c

@@ -762,19 +762,18 @@ int imx_pinctrl_probe(struct platform_device *pdev,
 
 
 	if (of_property_read_bool(dev_np, "fsl,input-sel")) {
 	if (of_property_read_bool(dev_np, "fsl,input-sel")) {
 		np = of_parse_phandle(dev_np, "fsl,input-sel", 0);
 		np = of_parse_phandle(dev_np, "fsl,input-sel", 0);
-		if (np) {
-			ipctl->input_sel_base = of_iomap(np, 0);
-			if (IS_ERR(ipctl->input_sel_base)) {
-				of_node_put(np);
-				dev_err(&pdev->dev,
-					"iomuxc input select base address not found\n");
-				return PTR_ERR(ipctl->input_sel_base);
-			}
-		} else {
+		if (!np) {
 			dev_err(&pdev->dev, "iomuxc fsl,input-sel property not found\n");
 			dev_err(&pdev->dev, "iomuxc fsl,input-sel property not found\n");
 			return -EINVAL;
 			return -EINVAL;
 		}
 		}
+
+		ipctl->input_sel_base = of_iomap(np, 0);
 		of_node_put(np);
 		of_node_put(np);
+		if (!ipctl->input_sel_base) {
+			dev_err(&pdev->dev,
+				"iomuxc input select base address not found\n");
+			return -ENOMEM;
+		}
 	}
 	}
 
 
 	imx_pinctrl_desc.name = dev_name(&pdev->dev);
 	imx_pinctrl_desc.name = dev_name(&pdev->dev);