]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
usb: renesas_usbhs: fix use-after-free in ISR during device removal
authorFan Wu <fanwu01@zju.edu.cn>
Tue, 3 Mar 2026 07:33:44 +0000 (07:33 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 11 Mar 2026 15:18:16 +0000 (16:18 +0100)
In usbhs_remove(), the driver frees resources (including the pipe array)
while the interrupt handler (usbhs_interrupt) is still registered. If an
interrupt fires after usbhs_pipe_remove() but before the driver is fully
unbound, the ISR may access freed memory, causing a use-after-free.

Fix this by calling devm_free_irq() before freeing resources. This ensures
the interrupt handler is both disabled and synchronized (waits for any
running ISR to complete) before usbhs_pipe_remove() is called.

Fixes: f1407d5c6624 ("usb: renesas_usbhs: Add Renesas USBHS common code")
Cc: stable <stable@kernel.org>
Suggested-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Fan Wu <fanwu01@zju.edu.cn>
Link: https://patch.msgid.link/20260303073344.34577-1-fanwu01@zju.edu.cn
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/renesas_usbhs/common.c

index cf4a0367d6d60ef2c26f8a2e309bc911530389b1..8c93bde4b8167399763d41faba99a920e9869546 100644 (file)
@@ -815,6 +815,15 @@ static void usbhs_remove(struct platform_device *pdev)
 
        usbhs_platform_call(priv, hardware_exit, pdev);
        reset_control_assert(priv->rsts);
+
+       /*
+        * Explicitly free the IRQ to ensure the interrupt handler is
+        * disabled and synchronized before freeing resources.
+        * devm_free_irq() calls free_irq() which waits for any running
+        * ISR to complete, preventing UAF.
+        */
+       devm_free_irq(&pdev->dev, priv->irq, priv);
+
        usbhs_mod_remove(priv);
        usbhs_fifo_remove(priv);
        usbhs_pipe_remove(priv);