iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu/dart: check return value after calling platform_get_resource()

Browse Source 
It will cause null-ptr-deref in resource_size(), if platform_get_resource()
returns NULL, move calling resource_size() after devm_ioremap_resource() that
will check 'res' to avoid null-ptr-deref.
And use devm_platform_get_and_ioremap_resource() to simplify code.

Fixes: 46d1fb072e76 ("iommu/dart: Add DART iommu driver")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Sven Peter <sven@svenpeter.dev>
Link: https://lore.kernel.org/r/20220425090826.2532165-1-yangyingliang@huawei.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Yang Yingliang 2022-04-25 17:08:26 +08:00 committed by Joerg Roedel
parent e6f48bed2c
commit a15932f437
1 changed files with 4 additions and 5 deletions

9
drivers/iommu/apple-dart.c

@ -859,16 +859,15 @@ static int apple_dart_probe(struct platform_device *pdev)
dart->dev = dev; dart->dev = dev;
spin_lock_init(&dart->lock); spin_lock_init(&dart->lock);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); dart->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (IS_ERR(dart->regs))
return PTR_ERR(dart->regs);
if (resource_size(res) < 0x4000) { if (resource_size(res) < 0x4000) {
dev_err(dev, "MMIO region too small (%pr)\n", res); dev_err(dev, "MMIO region too small (%pr)\n", res);
return -EINVAL; return -EINVAL;
} }
dart->regs = devm_ioremap_resource(dev, res);
if (IS_ERR(dart->regs))
return PTR_ERR(dart->regs);
dart->irq = platform_get_irq(pdev, 0); dart->irq = platform_get_irq(pdev, 0);
if (dart->irq < 0) if (dart->irq < 0)
return -ENODEV; return -ENODEV;