[PATCH v2] usb: fotg210-udc: fix potential memory leak in fotg210_udc_probe()

From: Yi Yang
Date: Thu Dec 01 2022 - 20:24:52 EST


In fotg210_udc_probe(), if devm_clk_get() or clk_prepare_enable()
fails, 'fotg210' will not be freed, which will lead to a memory leak.
Fix it by moving kfree() to a proper location.

In addition,we can use "return -ENOMEM" instead of "goto err"
to simplify the code.

Fixes: 718a38d092ec ("fotg210-udc: Handle PCLK")
Signed-off-by: Yi Yang <yiyang13@xxxxxxxxxx>
Reviewed-by: Andrzej Pietrasiewicz <andrzej.p@xxxxxxxxxxxxx>
---
v2:
-Use "return -ENOMEM" instead of "goto err"
drivers/usb/fotg210/fotg210-udc.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/fotg210/fotg210-udc.c b/drivers/usb/fotg210/fotg210-udc.c
index b9ea6c6d931c..66e1b7ee3346 100644
--- a/drivers/usb/fotg210/fotg210-udc.c
+++ b/drivers/usb/fotg210/fotg210-udc.c
@@ -1163,12 +1163,10 @@ int fotg210_udc_probe(struct platform_device *pdev)
return -ENODEV;
}

- ret = -ENOMEM;
-
/* initialize udc */
fotg210 = kzalloc(sizeof(struct fotg210_udc), GFP_KERNEL);
if (fotg210 == NULL)
- goto err;
+ return -ENOMEM;

fotg210->dev = dev;

@@ -1178,7 +1176,7 @@ int fotg210_udc_probe(struct platform_device *pdev)
ret = clk_prepare_enable(fotg210->pclk);
if (ret) {
dev_err(dev, "failed to enable PCLK\n");
- return ret;
+ goto err;
}
} else if (PTR_ERR(fotg210->pclk) == -EPROBE_DEFER) {
/*
@@ -1302,8 +1300,7 @@ int fotg210_udc_probe(struct platform_device *pdev)
if (!IS_ERR(fotg210->pclk))
clk_disable_unprepare(fotg210->pclk);

- kfree(fotg210);
-
err:
+ kfree(fotg210);
return ret;
}
--
2.17.1