]> www.infradead.org Git - users/jedix/linux-maple.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)
committerBrian Maly <brian.maly@oracle.com>
Tue, 11 Dec 2018 18:33:50 +0000 (13:33 -0500)
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>
(cherry picked from commit 297a6961ffb8ff4dc66c9fbf53b924bd1dda05d5)

Orabug: 29012346
CVE: CVE-2018-8043

Signed-off-by: John Donnelly <john.p.donnelly@oracle.com>
Reviewed-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/net/phy/mdio-bcm-unimac.c

index 414fdf1f343fe61549fef390ac3e417d1bc928e4..476f74ad2bce94868c40f8019f6b7b03f26c5c6a 100644 (file)
@@ -129,6 +129,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