[PATCH -next v2] usb: gadget: remove leaked entry from udc driver list

[PATCH -next v2] usb: gadget: remove leaked entry from udc driver list

[Zhang Qilong]

The usb_add_gadget_udc will add a new gadget to the udc class
driver list. Not calling usb_del_gadget_udc in error branch
will result in residual gadget entry in the udc driver list.
We fix it by calling usb_del_gadget_udc to clean it when error
return.

Fixes:48ba02b2e2b1a ("usb: gadget: add udc driver for max3420")
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
---
 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 34f4db554977..d2a2b20cc1ad 100644
--- a/drivers/usb/gadget/udc/max3420_udc.c
+++ b/drivers/usb/gadget/udc/max3420_udc.c
@@ -1255,12 +1255,14 @@ static int max3420_probe(struct spi_device *spi)
 	err = devm_request_irq(&spi->dev, irq, max3420_irq_handler, 0,
 			       "max3420", udc);
 	if (err < 0)
-		return err;
+		goto del_gadget;
 
 	udc->thread_task = kthread_create(max3420_thread, udc,
 					  "max3420-thread");
-	if (IS_ERR(udc->thread_task))
-		return PTR_ERR(udc->thread_task);
+	if (IS_ERR(udc->thread_task)) {
+		err = PTR_ERR(udc->thread_task);
+		goto del_gadget;
+	}
 
 	irq = of_irq_get_byname(spi->dev.of_node, "vbus");
 	if (irq <= 0) { /* no vbus irq implies self-powered design */
@@ -1280,10 +1282,14 @@ static int max3420_probe(struct spi_device *spi)
 		err = devm_request_irq(&spi->dev, irq,
 				       max3420_vbus_handler, 0, "vbus", udc);
 		if (err < 0)
-			return err;
+			goto del_gadget;
 	}
 
 	return 0;
+
+del_gadget:
+	usb_del_gadget_udc(&udc->gadget);
+	return err;
 }
 
 static int max3420_remove(struct spi_device *spi)
-- 
2.31.1

Re: [PATCH -next v2] usb: gadget: remove leaked entry from udc driver list

[Felipe Balbi]

Hi,

Zhang Qilong <zhangqilong3@huawei.com> writes:
> The usb_add_gadget_udc will add a new gadget to the udc class
> driver list. Not calling usb_del_gadget_udc in error branch
> will result in residual gadget entry in the udc driver list.
> We fix it by calling usb_del_gadget_udc to clean it when error
> return.
>
> Fixes:48ba02b2e2b1a ("usb: gadget: add udc driver for max3420")
> Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>

Thank you,

Acked-by: Felipe Balbi <balbi@kernel.org>

-- 
balbi

Re: [PATCH -next v2] usb: gadget: remove leaked entry from udc driver list

[Greg KH]

On Tue, Jul 27, 2021 at 03:31:42PM +0800, Zhang Qilong wrote:
> The usb_add_gadget_udc will add a new gadget to the udc class
> driver list. Not calling usb_del_gadget_udc in error branch
> will result in residual gadget entry in the udc driver list.
> We fix it by calling usb_del_gadget_udc to clean it when error
> return.
> 
> Fixes:48ba02b2e2b1a ("usb: gadget: add udc driver for max3420")

Note, in the future, this should look like:

Fixes: 48ba02b2e2b1 ("usb: gadget: add udc driver for max3420")

thanks,

greg k-h