]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: micrel: check return value after calling platform_get_resource()
authorYang Yingliang <yangyingliang@huawei.com>
Mon, 7 Jun 2021 14:55:21 +0000 (22:55 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:22:38 +0000 (16:22 +0200)
[ Upstream commit 20f1932e2282c58cb5ac59517585206cf5b385ae ]

It will cause null-ptr-deref if platform_get_resource() returns NULL,
we need check the return value.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/micrel/ks8842.c

index cb0102dd7f70fd1128adf2279ecd786ab4665f57..d691c33dffc6b8528e1e7f5c0c824dbac04109cb 100644 (file)
@@ -1150,6 +1150,10 @@ static int ks8842_probe(struct platform_device *pdev)
        unsigned i;
 
        iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!iomem) {
+               dev_err(&pdev->dev, "Invalid resource\n");
+               return -EINVAL;
+       }
        if (!request_mem_region(iomem->start, resource_size(iomem), DRV_NAME))
                goto err_mem_region;