Skip to contentSkip to conversation

net: ibm: emac: mal: fix unchecked platform_get_irq return values

PATCH Applied Rosen Penev 3 participants 3 messages Jun 3 – Jun 9

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 net: ibm: emac: mal: fix unchecked platform_get_irq return values

platform_get_irq() returns a negative errno on failure. Commit c4f5d0454cab5 moved the platform_get_irq() calls and explicitly removed the error checks that were previously present, claiming devm_request_irq() can handle it. However, a negative IRQ number passed to devm_request_irq() fails with -EINVAL instead of propagating the real error from platform_get_irq().

Restore the missing error checks with proper errno propagation.

Fixes c4f5d0454cab5 ("net: ibm: emac: mal: move irq maps down")
Assisted-by Opencode:Big-Pickle

---
v2: remove error messages. platform_get_irq writes its own.

 drivers/net/ethernet/ibm/emac/mal.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/net/ethernet/ibm/emac/mal.c +9 -0
index 7d70056e9008..83dd7f99d8d5 100644
@@ -635,6 +635,11 @@ static int mal_probe(struct platform_device *ofdev)
 	mal->txeob_irq = platform_get_irq(ofdev, 0);
 	mal->rxeob_irq = platform_get_irq(ofdev, 1);
 	mal->serr_irq = platform_get_irq(ofdev, 2);
+	if (mal->txeob_irq < 0 || mal->rxeob_irq < 0 || mal->serr_irq < 0) {
+		err = mal->txeob_irq < 0 ? mal->txeob_irq :
+		      mal->rxeob_irq < 0 ? mal->rxeob_irq : mal->serr_irq;
+		goto fail2;
+	}
 
 	if (mal_has_feature(mal, MAL_FTR_COMMON_ERR_INT)) {
 		mal->txde_irq = mal->rxde_irq = mal->serr_irq;
@@ -643,6 +648,10 @@ static int mal_probe(struct platform_device *ofdev)
 	} else {
 		mal->txde_irq = platform_get_irq(ofdev, 3);
 		mal->rxde_irq = platform_get_irq(ofdev, 4);
+		if (mal->txde_irq < 0 || mal->rxde_irq < 0) {
+			err = mal->txde_irq < 0 ? mal->txde_irq : mal->rxde_irq;
+			goto fail2;
+		}
 		irqflags = 0;
 		hdlr_serr = mal_serr;
 		hdlr_txde = mal_txde;

--
2.54.0

reviewer Reviewed-by on v2 1/1
#1 lore raw
Quoted 7 lines · Rosen Penev

platform_get_irq() returns a negative errno on failure. Commit c4f5d0454cab5 moved the platform_get_irq() calls and explicitly removed the error checks that were previously present, claiming devm_request_irq() can handle it. However, a negative IRQ number passed to devm_request_irq() fails with -EINVAL instead of propagating the real error from platform_get_irq().

Quoted 5 lines

Restore the missing error checks with proper errno propagation.

Fixes c4f5d0454cab5 ("net: ibm: emac: mal: move irq maps down")
Assisted-by Opencode:Big-Pickle
#2 lore raw
In reply to Rosen Penev
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 8 lines · On Wed, 3 Jun 2026 14:17:34 -0700 you wrote:

platform_get_irq() returns a negative errno on failure. Commit c4f5d0454cab5 moved the platform_get_irq() calls and explicitly removed the error checks that were previously present, claiming devm_request_irq() can handle it. However, a negative IRQ number passed to devm_request_irq() fails with -EINVAL instead of propagating the real error from platform_get_irq().

[...]

Here is the summary with links:
- [PATCHv2,net] net: ibm: emac: mal: fix unchecked platform_get_irq return values

    https://git.kernel.org/netdev/net-next/c/8084fc9292c2

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html