]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: w5100: check return value after calling platform_get_resource()
authorYang Yingliang <yangyingliang@huawei.com>
Tue, 31 Aug 2021 08:40:18 +0000 (16:40 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Sep 2021 10:26:36 +0000 (12:26 +0200)
[ Upstream commit a39ff4a47f3e1da3b036817ef436b1a9be10783a ]

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/wiznet/w5100.c

index bede1ff289c5934898e5f874b53ea5fb4c539021..a65b7291e12a2bce5b66abcf494f408389252a26 100644 (file)
@@ -1052,6 +1052,8 @@ static int w5100_mmio_probe(struct platform_device *pdev)
                mac_addr = data->mac_addr;
 
        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!mem)
+               return -EINVAL;
        if (resource_size(mem) < W5100_BUS_DIRECT_SIZE)
                ops = &w5100_mmio_indirect_ops;
        else