diff options
| author | Gustavo A. R. Silva <gustavo@embeddedor.com> | 2018-07-26 19:11:39 +0200 |
|---|---|---|
| committer | Jassi Brar <jaswinder.singh@linaro.org> | 2018-08-03 15:26:08 +0200 |
| commit | 3512a18cbd8d09e22a790540cb9624c3c49827ba (patch) | |
| tree | 71bdba1f0683118e899ecfb67e5f08fc5523b279 /drivers/mailbox | |
| parent | Merge tag 'media/v4.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mc... (diff) | |
| download | linux-3512a18cbd8d09e22a790540cb9624c3c49827ba.tar.xz linux-3512a18cbd8d09e22a790540cb9624c3c49827ba.zip | |
mailbox: xgene-slimpro: Fix potential NULL pointer dereference
There is a potential execution path in which function
platform_get_resource() returns NULL. If this happens,
we will end up having a NULL pointer dereference.
Fix this by replacing devm_ioremap with devm_ioremap_resource,
which has the NULL check and the memory region request.
This code was detected with the help of Coccinelle.
Cc: stable@vger.kernel.org
Fixes: f700e84f417b ("mailbox: Add support for APM X-Gene platform mailbox driver")
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
Diffstat (limited to 'drivers/mailbox')
| -rw-r--r-- | drivers/mailbox/mailbox-xgene-slimpro.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mailbox/mailbox-xgene-slimpro.c b/drivers/mailbox/mailbox-xgene-slimpro.c index a7040163dd43..b8b2b3533f46 100644 --- a/drivers/mailbox/mailbox-xgene-slimpro.c +++ b/drivers/mailbox/mailbox-xgene-slimpro.c @@ -195,9 +195,9 @@ static int slimpro_mbox_probe(struct platform_device *pdev) platform_set_drvdata(pdev, ctx); regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); - mb_base = devm_ioremap(&pdev->dev, regs->start, resource_size(regs)); - if (!mb_base) - return -ENOMEM; + mb_base = devm_ioremap_resource(&pdev->dev, regs); + if (IS_ERR(mb_base)) + return PTR_ERR(mb_base); /* Setup mailbox links */ for (i = 0; i < MBOX_CNT; i++) { |