Input: apbps2: Simplify resource mapping and IRQ retrieval
Subsystems (2)
PATCH 1/1 Input: apbps2: Simplify resource mapping and IRQ retrieval
Simplify resource mapping by using devm_platform_ioremap_resource() instead of the longer devm_platform_get_and_ioremap_resource() helper as the last argument is NULL.
Additionally, use platform_get_irq() to retrieve the interrupt instead of irq_of_parse_and_map() and propagate its error code on failure. irq_of_parse_and_map() requires irq_dispose_mapping, which is missing.
--- drivers/input/serio/apbps2.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/input/serio/apbps2.c +5 -2
@@ -140,7 +140,7 @@ static int apbps2_of_probe(struct platform_device *ofdev) }/* Find device address */ - priv->regs =devm_platform_get_and_ioremap_resource (ofdev,0 ,NULL ); + priv->regs =devm_platform_ioremap_resource (ofdev,0 );if (IS_ERR (priv->regs))return PTR_ERR (priv->regs);
@@ -148,7 +148,10 @@ static int apbps2_of_probe(struct platform_device *ofdev)iowrite32be (0 , &priv->regs->ctrl);/* IRQ */ - irq =irq_of_parse_and_map (ofdev->dev.of_node,0 ); + irq =platform_get_irq (ofdev,0 ); +if (irq <0 ) +return irq; + err =devm_request_irq (&ofdev->dev, irq, apbps2_isr,IRQF_SHARED ,"apbps2" , priv);if (err) {
Signature · 1 line
2.54.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Pre-existing issues:
- [High] Requesting a shared IRQ before the serio port is fully allocated and initialized leads to a potential NULL pointer dereference or uninitialized spinlock access in the interrupt handler.
- [High] Mixing devm managed interrupts with manual resource unregistration causes an incorrect teardown order, leading to a use-after-free if a shared interrupt fires during device removal. --
commit d306647eec008111ed14c378d300aa2cb98191b6
Author: Rosen Penev <[email protected]>
Input: apbps2: Simplify resource mapping and IRQ retrieval
Simplify resource mapping by using devm_platform_ioremap_resource() instead of the longer devm_platform_get_and_ioremap_resource() helper as the last argument is NULL.
Additionally, use platform_get_irq() to retrieve the interrupt instead of irq_of_parse_and_map() and propagate its error code on failure. irq_of_parse_and_map() requires irq_dispose_mapping, which is missing.
Quoted 4 lines
drivers/input/serio/apbps2.c +0
-0
[ ... ]
drivers/input/serio/apbps2.c static int apbps2_of_probe(struct platform_device *ofdev) · line 156
Quoted 11 lines
drivers/input/serio/apbps2.c +4
-1@@ -148,7 +148,10 @@ static int apbps2_of_probe(struct platform_device *ofdev)iowrite32be (0 , &priv->regs->ctrl);/* IRQ */ - irq =irq_of_parse_and_map (ofdev->dev.of_node,0 ); + irq =platform_get_irq (ofdev,0 ); +if (irq <0 ) +return irq; + err =devm_request_irq (&ofdev->dev, irq, apbps2_isr,IRQF_SHARED ,"apbps2" , priv);
[Severity: High]
This is a pre-existing issue, but requesting a shared IRQ here before the serio port is fully allocated and initialized creates a window for a NULL pointer dereference.
If a shared interrupt fires immediately (triggered by another device on the same line) and there is leftover data in the PS/2 FIFO, apbps2_isr() will execute:
drivers/input/serio/apbps2.c:apbps2_isr() {
...
serio_interrupt(priv->io, data, rxflags);
...
}Since priv->io is either NULL or not fully initialized until later in probe:
drivers/input/serio/apbps2.c:apbps2_of_probe() {
...
priv->io = ... /* allocated later */
...
}Could this lead to a crash if the ISR fires early?
[Severity: High]
This is another pre-existing issue, but does mixing a devm-managed interrupt here with manual unregistration in apbps2_of_remove() cause a teardown order issue?
In apbps2_of_remove(), the driver manually unregisters and frees the serio port:
drivers/input/serio/apbps2.c:apbps2_of_remove() {
...
serio_unregister_port(priv->io);
...
}Because the interrupt was requested with devm_request_irq(), its handler remains active until devres runs free_irq() after apbps2_of_remove() returns. If a shared interrupt fires during this window and there is pending data, apbps2_isr() will execute and pass the already-freed priv->io pointer to serio_interrupt(), resulting in a use-after-free.
Could the interrupt teardown order be adjusted to prevent this race?
Quoted 1 line
drivers/input/serio/apbps2.c +0
-0if (err) {
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Quoted 11 lines · Rosen Penev
Simplify resource mapping by using
devm_platform_ioremap_resource()instead of the longerdevm_platform_get_and_ioremap_resource()helper as the last argument is NULL.Additionally, use
platform_get_irq()to retrieve the interrupt instead ofirq_of_parse_and_map()and propagate its error code on failure.irq_of_parse_and_map()requiresirq_dispose_mapping, which is missing.Assisted-by Antigravity:Gemini-3.5-FlashSigned-off-by Rosen Penev <[email protected]>
Applied, thank you.
Signature · 1 line
Dmitry