Skip to contentSkip to conversation

clk: bcm2835: fix check of error code returned by devm_ioremap_resource()

PATCH New Vladimir Zapolskiy 3 participants 3 messages Mar 6, 2016 – Mar 16, 2016

Subsystems (3)
Common clk Broadcom BCM2711/BCM2835 Arm architecture Broadcom BCM281XX/BCM11XXX/BCM216XX Arm architecture
lore
Share & tools
lore

Vladimir Zapolskiy

author
#0 lore raw

PATCH 1/1 clk: bcm2835: fix check of error code returned by devm_ioremap_resource()

The change fixes potential oops while accessing iomem on invalid address, if devm_ioremap_resource() fails due to some reason.

The devm_ioremap_resource() function returns ERR_PTR() and never returns NULL, which makes useless a following check for NULL.

Signed-off-by Vladimir Zapolskiy <[email protected]>
Fixes 5e63dcc74b30 ("clk: bcm2835: Add a driver for the auxiliary peripheral clock gates")
---
 drivers/clk/bcm/clk-bcm2835-aux.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/bcm/clk-bcm2835-aux.c +2 -2
index e4f89e2..3a177ad 100644
@@ -38,8 +38,8 @@ static int bcm2835_aux_clk_probe(struct platform_device *pdev)
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	reg = devm_ioremap_resource(dev, res);
-	if (!reg)
-		return -ENODEV;
+	if (IS_ERR(reg))
+		return PTR_ERR(reg);
 
 	onecell = devm_kmalloc(dev, sizeof(*onecell), GFP_KERNEL);
 	if (!onecell)
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 clk: bcm2835: fix check of error code returned by devm_ioremap_resource()

Quoted 8 lines · Vladimir Zapolskiy

The change fixes potential oops while accessing iomem on invalid address, if devm_ioremap_resource() fails due to some reason.

The devm_ioremap_resource() function returns ERR_PTR() and never returns NULL, which makes useless a following check for NULL.

Signed-off-by Vladimir Zapolskiy <[email protected]>
Fixes 5e63dcc74b30 ("clk: bcm2835: Add a driver for the auxiliary peripheral clock gates")
Reviewed-by Eric Anholt <[email protected]>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160307/8e3b3375/attachment.sig>

Applied
#2 lore raw

PATCH 1/1 clk: bcm2835: fix check of error code returned by devm_ioremap_resource()

In reply to Vladimir Zapolskiy
Quoted 9 lines · Vladimir Zapolskiy

The change fixes potential oops while accessing iomem on invalid address, if devm_ioremap_resource() fails due to some reason.

The devm_ioremap_resource() function returns ERR_PTR() and never returns NULL, which makes useless a following check for NULL.

Signed-off-by Vladimir Zapolskiy <[email protected]>
Fixes 5e63dcc74b30 ("clk: bcm2835: Add a driver for the auxiliary peripheral clock gates")

---

Applied to clk-next

Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project