| Message ID | 20200520095532.20780-1-tangbin@cmss.chinamobile.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: sgi: ioc3-eth: Fix return value check in ioc3eth_probe() | expand |
From: Tang Bin <tangbin@cmss.chinamobile.com> Date: Wed, 20 May 2020 17:55:32 +0800 > In the function devm_platform_ioremap_resource(), if get resource > failed, the return value is ERR_PTR() not NULL. Thus it must be > replaced by IS_ERR(), or else it may result in crashes if a critical > error path is encountered. > > Fixes: 0ce5ebd24d25 ("mfd: ioc3: Add driver for SGI IOC3 chip") > Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com> > Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com> Applied, thanks.
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c index db6b2988e..8021a3d34 100644 --- a/drivers/net/ethernet/sgi/ioc3-eth.c +++ b/drivers/net/ethernet/sgi/ioc3-eth.c @@ -865,17 +865,17 @@ static int ioc3eth_probe(struct platform_device *pdev) ip = netdev_priv(dev); ip->dma_dev = pdev->dev.parent; ip->regs = devm_platform_ioremap_resource(pdev, 0); - if (!ip->regs) { - err = -ENOMEM; + if (IS_ERR(ip->regs)) { + err = PTR_ERR(ip->regs); goto out_free; } ip->ssram = devm_platform_ioremap_resource(pdev, 1); - if (!ip->ssram) { - err = -ENOMEM; + if (IS_ERR(ip->ssram)) { + err = PTR_ERR(ip->ssram); goto out_free; } - + dev->irq = platform_get_irq(pdev, 0); if (dev->irq < 0) { err = dev->irq;
In the function devm_platform_ioremap_resource(), if get resource failed, the return value is ERR_PTR() not NULL. Thus it must be replaced by IS_ERR(), or else it may result in crashes if a critical error path is encountered. Fixes: 0ce5ebd24d25 ("mfd: ioc3: Add driver for SGI IOC3 chip") Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com> Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com> --- drivers/net/ethernet/sgi/ioc3-eth.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)