summaryrefslogtreecommitdiff
path: root/drivers/net/fjes
diff options
context:
space:
mode:
authorYang Yingliang <yangyingliang@huawei.com>2021-06-10 16:02:43 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-07-19 08:53:10 +0200
commit91f6b357e9c1140157d184c58f518eca5d257210 (patch)
treef67ab14ddc58b36275c426d0b64c8e46828d3171 /drivers/net/fjes
parent2c028cee95a46e24a07616adfcc697bc86e249a8 (diff)
fjes: check return value after calling platform_get_resource()
[ Upstream commit f18c11812c949553d2b2481ecaa274dd51bed1e7 ] 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>
Diffstat (limited to 'drivers/net/fjes')
-rw-r--r--drivers/net/fjes/fjes_main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/fjes/fjes_main.c b/drivers/net/fjes/fjes_main.c
index 91a1059517f5..b89b4a3800a4 100644
--- a/drivers/net/fjes/fjes_main.c
+++ b/drivers/net/fjes/fjes_main.c
@@ -1262,6 +1262,10 @@ static int fjes_probe(struct platform_device *plat_dev)
adapter->interrupt_watch_enable = false;
res = platform_get_resource(plat_dev, IORESOURCE_MEM, 0);
+ if (!res) {
+ err = -EINVAL;
+ goto err_free_control_wq;
+ }
hw->hw_res.start = res->start;
hw->hw_res.size = resource_size(res);
hw->hw_res.irq = platform_get_irq(plat_dev, 0);