Commit c8411791 authored by Ma Ke's avatar Ma Ke Committed by Greg Kroah-Hartman
Browse files

USB: lpc32xx_udc: Fix error handling in probe 



lpc32xx_udc_probe() acquires an i2c_client reference through
isp1301_get_client() but fails to release it in both error handling
paths and the normal removal path. This could result in a reference
count leak for the I2C device, preventing proper cleanup and potentially
leading to resource exhaustion. Add put_device() to release the
reference in the probe failure path and in the remove function.

Calling path: isp1301_get_client() -> of_find_i2c_device_by_node() ->
i2c_find_device_by_fwnode(). As comments of i2c_find_device_by_fwnode()
says, 'The user must call put_device(&client->dev) once done with the
i2c client.'

Found by code review.

Cc: stable <stable@kernel.org>
Fixes: 24a28e42 ("USB: gadget driver for LPC32xx")
Signed-off-by: default avatarMa Ke <make24@iscas.ac.cn>
Link: https://patch.msgid.link/20251215020931.15324-1-make24@iscas.ac.cn


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 128bb7fa

drivers/usb/gadget/udc/lpc32xx_udc.c

+15 −6
Original line number Diff line number Diff line
@@ -3020,7 +3020,7 @@ static int lpc32xx_udc_probe(struct platform_device *pdev) 
	pdev->dev.dma_mask = &lpc32xx_usbd_dmamask;

	retval = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));

	if (retval)

		return retval;

		goto i2c_fail;



	udc->board = &lpc32xx_usbddata;
@@ -3038,28 +3038,32 @@ static int lpc32xx_udc_probe(struct platform_device *pdev) 
	/* Get IRQs */

	for (i = 0; i < 4; i++) {

		udc->udp_irq[i] = platform_get_irq(pdev, i);

		if (udc->udp_irq[i] < 0)

			return udc->udp_irq[i];

		if (udc->udp_irq[i] < 0) {

			retval = udc->udp_irq[i];

			goto i2c_fail;

		}

	}



	udc->udp_baseaddr = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(udc->udp_baseaddr)) {

		dev_err(udc->dev, "IO map failure\n");

		return PTR_ERR(udc->udp_baseaddr);

		retval = PTR_ERR(udc->udp_baseaddr);

		goto i2c_fail;

	}



	/* Get USB device clock */

	udc->usb_slv_clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(udc->usb_slv_clk)) {

		dev_err(udc->dev, "failed to acquire USB device clock\n");

		return PTR_ERR(udc->usb_slv_clk);

		retval = PTR_ERR(udc->usb_slv_clk);

		goto i2c_fail;

	}



	/* Enable USB device clock */

	retval = clk_prepare_enable(udc->usb_slv_clk);

	if (retval < 0) {

		dev_err(udc->dev, "failed to start USB device clock\n");

		return retval;

		goto i2c_fail;

	}



	/* Setup deferred workqueue data */
@@ -3161,6 +3165,8 @@ static int lpc32xx_udc_probe(struct platform_device *pdev) 
	dma_free_coherent(&pdev->dev, UDCA_BUFF_SIZE,

			  udc->udca_v_base, udc->udca_p_base);

i2c_fail:

	if (udc->isp1301_i2c_client)

		put_device(&udc->isp1301_i2c_client->dev);

	clk_disable_unprepare(udc->usb_slv_clk);

	dev_err(udc->dev, "%s probe failed, %d\n", driver_name, retval);
@@ -3189,6 +3195,9 @@ static void lpc32xx_udc_remove(struct platform_device *pdev) 
	dma_free_coherent(&pdev->dev, UDCA_BUFF_SIZE,

			  udc->udca_v_base, udc->udca_p_base);



	if (udc->isp1301_i2c_client)

		put_device(&udc->isp1301_i2c_client->dev);



	clk_disable_unprepare(udc->usb_slv_clk);

}