Linux USB
 help / color / mirror / Atom feed
* [PATCH] usb: host: max3421: Fix potential resource leak on IRQ request failure
@ 2026-11-16 14:25 Guangshuo Li
  2026-11-16 14:36 ` sashiko-bot
  0 siblings, 1 reply; 2+ messages in thread
From: Guangshuo Li @ 2026-11-16 14:25 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: linux-usb, linux-kernel

If request_irq() fails after usb_add_hcd(), probe drops the HCD reference
without removing the registered root hub. The root hub and its HCD
reference are left behind.

Remove the HCD before unwinding the SPI thread. Keep the transfer buffers
and platform data alive until the thread has stopped.

This issue was found by our static analysis tool under development.

Fixes: 2d53139f3162 ("Add support for using a MAX3421E chip as a host driver.")
Signed-off-by: Guangshuo Li <liguangshuo@mail.sdu.edu.cn>
---
 drivers/usb/host/max3421-hcd.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/drivers/usb/host/max3421-hcd.c b/drivers/usb/host/max3421-hcd.c
index 73e76d0e6973..09ba92c41a0d 100644
--- a/drivers/usb/host/max3421-hcd.c
+++ b/drivers/usb/host/max3421-hcd.c
@@ -1911,23 +1911,24 @@ max3421_probe(struct spi_device *spi)
 			     IRQF_TRIGGER_LOW, "max3421", hcd);
 	if (retval < 0) {
 		dev_err(&spi->dev, "failed to request irq %d\n", spi->irq);
-		goto error;
+		goto remove_hcd;
 	}
 	return 0;
 
+remove_hcd:
+	usb_remove_hcd(hcd);
 error:
-	if (IS_ENABLED(CONFIG_OF) && dev->of_node && pdata) {
-		devm_kfree(&spi->dev, pdata);
-		spi->dev.platform_data = NULL;
-	}
-
 	if (hcd) {
-		kfree(max3421_hcd->tx);
-		kfree(max3421_hcd->rx);
 		if (!IS_ERR_OR_NULL(max3421_hcd->spi_thread))
 			kthread_stop(max3421_hcd->spi_thread);
+		kfree(max3421_hcd->tx);
+		kfree(max3421_hcd->rx);
 		usb_put_hcd(hcd);
 	}
+	if (IS_ENABLED(CONFIG_OF) && dev->of_node && pdata) {
+		devm_kfree(&spi->dev, pdata);
+		spi->dev.platform_data = NULL;
+	}
 	return retval;
 }
 

base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] usb: host: max3421: Fix potential resource leak on IRQ request failure
  2026-11-16 14:25 [PATCH] usb: host: max3421: Fix potential resource leak on IRQ request failure Guangshuo Li
@ 2026-11-16 14:36 ` sashiko-bot
  0 siblings, 0 replies; 2+ messages in thread
From: sashiko-bot @ 2026-11-16 14:36 UTC (permalink / raw)
  To: Guangshuo Li; +Cc: linux-usb

Thank you for your contribution! Sashiko AI review found no new issues
in this patch, but noticed 1 related pre-existing issue it does not
introduce:
- [Critical] usb: host: max3421-hcd: use-after-free in
  max3421_irq_handler() [1]
--

commit bf9ea93a3f4c8766b32b8f1ff53f8a0863775270
Author: Guangshuo Li <liguangshuo@mail.sdu.edu.cn>

usb: host: max3421: Fix potential resource leak on IRQ request failure

This commit calls usb_remove_hcd() when request_irq() fails in
max3421_probe() and reorders the error cleanup so the SPI thread is
stopped before freeing the transfer buffers and platform data.

> diff --git a/drivers/usb/host/max3421-hcd.c b/drivers/usb/host/max3421-hcd.c
> index 73e76d0e69738..09ba92c41a0d5 100644
> --- a/drivers/usb/host/max3421-hcd.c
> +++ b/drivers/usb/host/max3421-hcd.c
> @@ -1911,23 +1911,24 @@ max3421_probe(struct spi_device *spi)
>  			     IRQF_TRIGGER_LOW, "max3421", hcd);
>  	if (retval < 0) {
>  		dev_err(&spi->dev, "failed to request irq %d\n", spi->irq);
> -		goto error;
> +		goto remove_hcd;
>  	}
>  	return 0;
>  
> +remove_hcd:
> +	usb_remove_hcd(hcd);
>  error:
> -	if (IS_ENABLED(CONFIG_OF) && dev->of_node && pdata) {
> -		devm_kfree(&spi->dev, pdata);
> -		spi->dev.platform_data = NULL;
> -	}
> -
>  	if (hcd) {
> -		kfree(max3421_hcd->tx);
> -		kfree(max3421_hcd->rx);
>  		if (!IS_ERR_OR_NULL(max3421_hcd->spi_thread))
>  			kthread_stop(max3421_hcd->spi_thread);

[Severity: Critical]
This problem wasn't introduced by this patch, but can max3421_remove()
trigger a use-after-free on max3421_hcd->spi_thread in
max3421_irq_handler() [1]?

CPU0                                    CPU1
max3421_remove()
  kthread_stop(max3421_hcd->spi_thread)
                                        max3421_irq_handler()
                                          if (max3421_hcd->spi_thread)
                                            wake_up_process(...)
                                              <-- use-after-free
  free_irq(spi->irq, hcd)

max3421_remove() stops max3421_hcd->spi_thread (which drops the
task_struct reference) without clearing the pointer, before calling
free_irq().  An interrupt firing in that window wakes the freed
task_struct.  Calling free_irq() before kthread_stop() in max3421_remove()
would avoid this race.

[1] https://sashiko.dev/#/bug/linux-1a37fb82-5226-4771-845f-e2e6c320c91c

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261116-c29ba55625-usb-host@mail.sdu.edu.cn?part=1

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-16 14:36 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-16 14:25 [PATCH] usb: host: max3421: Fix potential resource leak on IRQ request failure Guangshuo Li
2026-11-16 14:36 ` sashiko-bot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox