projects/linux·commit c29e9da5

pinctrl: nsp: Fix potential NULL dereference

c29e9da5 · Wei Yongjun <[email protected]> · 2018-07-11 12:34:21 +00:00

platform_get_resource() may fail and return NULL, so we should
better check it's return value to avoid a NULL pointer dereference
a bit later in the code.

This is detected by Coccinelle semantic patch.

@@
expression pdev, res, n, t, e, e1, e2;
@@

res = platform_get_resource(pdev, t, n);
+ if (!res)
+   return -EINVAL;
... when != res == NULL
e = devm_ioremap_nocache(e1, res->start, e2);

Fixes: cc4fa83f66e9 ("pinctrl: nsp: add pinmux driver support for Broadcom NSP SoC")
Signed-off-by: Wei Yongjun <[email protected]>
Reviewed-by: Ray Jui <[email protected]>
Signed-off-by: Linus Walleij <[email protected]>
Commit
c29e9da56bebb4c2c794e871b0dc0298bbf08142
Parents
f90a21c8

Changes

1 files changed · +2 −0

FileStatusAddDelContent
drivers/pinctrl/bcm/pinctrl-nsp-mux.cmodified+2−0View file

drivers/pinctrl/bcm/pinctrl-nsp-mux.c

View file
diff --git a/drivers/pinctrl/bcm/pinctrl-nsp-mux.c b/drivers/pinctrl/bcm/pinctrl-nsp-mux.c
index 5cd8166..87618a4 100644
--- a/drivers/pinctrl/bcm/pinctrl-nsp-mux.c
+++ b/drivers/pinctrl/bcm/pinctrl-nsp-mux.c
@@ -577,6 +577,8 @@ static int nsp_pinmux_probe(struct platform_device *pdev)
return PTR_ERR(pinctrl->base0);
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+ if (!res)
+ return -EINVAL;
pinctrl->base1 = devm_ioremap_nocache(&pdev->dev, res->start,
resource_size(res));
if (!pinctrl->base1) {