2020-04-23 02:16:58

by Tang Bin

[permalink] [raw]
Subject: [PATCH v3] 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 <[email protected]>
Signed-off-by: Tang Bin <[email protected]>
---
v3:
- remove extra line, between the tags
v2:
- add fixes tag
---
drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
index 269596c15..2e5202923 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:
--
2.20.1.windows.1




2020-04-23 22:35:10

by David Miller

[permalink] [raw]
Subject: Re: [PATCH v3] net: ethernet: ixp4xx: Add error handling in ixp4xx_eth_probe()

From: Tang Bin <[email protected]>
Date: Thu, 23 Apr 2020 10:16:31 +0800

> 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 <[email protected]>
> Signed-off-by: Tang Bin <[email protected]>

Applied, thank you.