aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTang Bin <tangbin@cmss.chinamobile.com>2020-04-23 10:16:31 +0800
committerDavid S. Miller <davem@davemloft.net>2020-04-23 15:32:45 -0700
commit6ed79cec3ced6e346a10a70120fcee5f03591bab (patch)
tree9c084fd69420a52233f35227b4788ee9753b6421
parentcxgb4: fix adapter crash due to wrong MC size (diff)
downloadlinux-dev-6ed79cec3ced6e346a10a70120fcee5f03591bab.tar.xz
linux-dev-6ed79cec3ced6e346a10a70120fcee5f03591bab.zip
net: ethernet: ixp4xx: Add error handling in ixp4xx_eth_probe()
The function ixp4xx_eth_probe() does not perform sufficient error checking after executing devm_ioremap_resource(), which can result in crashes if a critical error path is encountered. Fixes: f458ac479777 ("ARM/net: ixp4xx: Pass ethernet physical base as resource") Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com> Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/xscale/ixp4xx_eth.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
index 269596c15133..2e5202923510 100644
--- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
@@ -1387,6 +1387,8 @@ static int ixp4xx_eth_probe(struct platform_device *pdev)
return -ENODEV;
regs_phys = res->start;
port->regs = devm_ioremap_resource(dev, res);
+ if (IS_ERR(port->regs))
+ return PTR_ERR(port->regs);
switch (port->id) {
case IXP4XX_ETH_NPEA: