* [PATCH] usb: gadget: max3420: Fix potential thread leak on probe failure
@ 2026-11-20 17:35 Guangshuo Li
2026-11-20 17:48 ` sashiko-bot
0 siblings, 1 reply; 2+ messages in thread
From: Guangshuo Li @ 2026-11-20 17:35 UTC (permalink / raw)
To: Neill Kapron, Greg Kroah-Hartman; +Cc: linux-usb, linux-kernel
If requesting the VBUS interrupt fails, probe unregisters the gadget
but leaves the already created thread behind. Managed cleanup then
releases the state referenced by the thread.
Unregister the gadget, disable and synchronize the UDC interrupt, then
stop the thread before returning the probe error.
This issue was found by our static analysis tool under development.
Fixes: 48ba02b2e2b1 ("usb: gadget: add udc driver for max3420")
Signed-off-by: Guangshuo Li <liguangshuo@mail.sdu.edu.cn>
---
drivers/usb/gadget/udc/max3420_udc.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/gadget/udc/max3420_udc.c b/drivers/usb/gadget/udc/max3420_udc.c
index 11fd61cba5af..84309229216b 100644
--- a/drivers/usb/gadget/udc/max3420_udc.c
+++ b/drivers/usb/gadget/udc/max3420_udc.c
@@ -1198,7 +1198,7 @@ static void max3420_eps_init(struct max3420_udc *udc)
static int max3420_probe(struct spi_device *spi)
{
struct max3420_udc *udc;
- int err, irq;
+ int err, irq, udc_irq;
u8 reg[8];
if (spi->controller->flags & SPI_CONTROLLER_HALF_DUPLEX) {
@@ -1252,8 +1252,8 @@ static int max3420_probe(struct spi_device *spi)
spi_set_drvdata(spi, udc);
- irq = of_irq_get_byname(spi->dev.of_node, "udc");
- err = devm_request_irq(&spi->dev, irq, max3420_irq_handler, 0,
+ udc_irq = of_irq_get_byname(spi->dev.of_node, "udc");
+ err = devm_request_irq(&spi->dev, udc_irq, max3420_irq_handler, 0,
"max3420", udc);
if (err < 0)
goto del_gadget;
@@ -1283,11 +1283,17 @@ static int max3420_probe(struct spi_device *spi)
err = devm_request_irq(&spi->dev, irq,
max3420_vbus_handler, 0, "vbus", udc);
if (err < 0)
- goto del_gadget;
+ goto stop_thread;
}
return 0;
+stop_thread:
+ usb_del_gadget_udc(&udc->gadget);
+ disable_irq(udc_irq);
+ kthread_stop(udc->thread_task);
+ return err;
+
del_gadget:
usb_del_gadget_udc(&udc->gadget);
return err;
base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] usb: gadget: max3420: Fix potential thread leak on probe failure
2026-11-20 17:35 [PATCH] usb: gadget: max3420: Fix potential thread leak on probe failure Guangshuo Li
@ 2026-11-20 17:48 ` sashiko-bot
0 siblings, 0 replies; 2+ messages in thread
From: sashiko-bot @ 2026-11-20 17:48 UTC (permalink / raw)
To: Guangshuo Li; +Cc: linux-usb
Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [Medium] usb: gadget: max3420: UAF of udc->dev in max3420_probe()
stop_thread path
--
commit 1aa81e8a2fed8c598f135d63a9ff28aff8ed2d0f
Author: Guangshuo Li <liguangshuo@mail.sdu.edu.cn>
usb: gadget: max3420: Fix potential thread leak on probe failure
This commit disables the UDC interrupt and stops the SPI worker thread if
requesting the VBUS interrupt fails during probe.
> diff --git a/drivers/usb/gadget/udc/max3420_udc.c b/drivers/usb/gadget/udc/max3420_udc.c
> index 11fd61cba5af9..84309229216b9 100644
> --- a/drivers/usb/gadget/udc/max3420_udc.c
> +++ b/drivers/usb/gadget/udc/max3420_udc.c
[ ... ]
> @@ -1283,11 +1283,17 @@ static int max3420_probe(struct spi_device *spi)
> err = devm_request_irq(&spi->dev, irq,
> max3420_vbus_handler, 0, "vbus", udc);
> if (err < 0)
> - goto del_gadget;
> + goto stop_thread;
> }
>
> return 0;
>
> +stop_thread:
> + usb_del_gadget_udc(&udc->gadget);
> + disable_irq(udc_irq);
> + kthread_stop(udc->thread_task);
> + return err;
> +
> del_gadget:
> usb_del_gadget_udc(&udc->gadget);
> return err;
[Severity: Medium]
Can calling usb_del_gadget_udc() before stopping udc->thread_task cause a
use-after-free of udc->dev->kobj.name when max3420_thread() exits?
udc->dev aliases &udc->gadget.dev without taking an extra reference.
usb_del_gadget_udc() can wake udc->thread_task via max3420_udc_stop() (or
max3420_irq_handler() can wake it while udc_irq is still enabled) and
then drops the final reference on udc->gadget.dev via usb_put_gadget(),
freeing udc->gadget.dev.kobj.name. When kthread_stop() runs next,
max3420_thread() logs its exit with dev_info(udc->dev, ...), reading the
freed name:
drivers/usb/gadget/udc/max3420_udc.c:max3420_thread() {
...
set_current_state(TASK_RUNNING);
dev_info(udc->dev, "SPI thread exiting\n");
return 0;
}
Disabling udc_irq and stopping udc->thread_task before calling
usb_del_gadget_udc() (or falling through to del_gadget) would avoid this.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261120173512.3923833-1-liguangshuo@mail.sdu.edu.cn?part=1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-20 17:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-20 17:35 [PATCH] usb: gadget: max3420: Fix potential thread leak on probe failure Guangshuo Li
2026-11-20 17:48 ` sashiko-bot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.