Skip to contentSkip to conversation

mailbox: xgene-slimpro: Fix potential NULL pointer dereference

PATCH New Gustavo A. R. Silva 1 participant 1 message Jul 26, 2018 Mailbox API

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

Fixes f700e84f417b ("mailbox: Add support for APM X-Gene platform mailbox driver")

---
Changes in v2:
- Replace devm_ioremap with devm_ioremap_resource.

 drivers/mailbox/mailbox-xgene-slimpro.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/mailbox/mailbox-xgene-slimpro.c +3 -3
index a704016..b8b2b35 100644
@@ -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++) {
Signature · 1 line
2.7.4