]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
net: phy: mdio-bcm-unimac: fix potential NULL dereference in unimac_mdio_probe()
authorWei Yongjun <weiyongjun1@huawei.com>
Thu, 11 Jan 2018 11:21:51 +0000 (11:21 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 5 Aug 2020 08:06:47 +0000 (10:06 +0200)
[ Upstream commit 297a6961ffb8ff4dc66c9fbf53b924bd1dda05d5 ]

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(e1, res->start, e2);

Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/phy/mdio-bcm-unimac.c

index 52703bbd4d666bd2d3896bc03dcdddb4f21a2e03..df75efa96a7d95cecd6e4678f5dd5dfbaa9f4095 100644 (file)
@@ -237,6 +237,8 @@ static int unimac_mdio_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!r)
+               return -EINVAL;
 
        /* Just ioremap, as this MDIO block is usually integrated into an
         * Ethernet MAC controller register range