| From foo@baz Wed Aug 22 09:42:09 CEST 2018 |
| From: Wei Yongjun <weiyongjun1@huawei.com> |
| Date: Wed, 11 Jul 2018 12:34:21 +0000 |
| Subject: pinctrl: nsp: Fix potential NULL dereference |
| |
| From: Wei Yongjun <weiyongjun1@huawei.com> |
| |
| [ Upstream commit c29e9da56bebb4c2c794e871b0dc0298bbf08142 ] |
| |
| 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 <weiyongjun1@huawei.com> |
| Reviewed-by: Ray Jui <ray.jui@broadcom.com> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/pinctrl/bcm/pinctrl-nsp-mux.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- 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 platf |
| 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) { |
