xhci: dbc: Fix memory leak in xhci_alloc_dbc()

[PATCH] xhci: dbc: Fix memory leak in xhci_alloc_dbc()

Posted by Rafael Mendonca 3 years, 6 months ago

If DbC is already in use, then the allocated memory for the xhci_dbc struct
doesn't get freed before returning NULL, which leads to a memleak.

Fixes: 534675942e90 ("xhci: dbc: refactor xhci_dbc_init()")
Signed-off-by: Rafael Mendonca <rafaelmendsr@gmail.com>
---
 drivers/usb/host/xhci-dbgcap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/host/xhci-dbgcap.c b/drivers/usb/host/xhci-dbgcap.c
index e61155fa6379..f1367b53b260 100644
--- a/drivers/usb/host/xhci-dbgcap.c
+++ b/drivers/usb/host/xhci-dbgcap.c
@@ -988,7 +988,7 @@ xhci_alloc_dbc(struct device *dev, void __iomem *base, const struct dbc_driver *
 	dbc->driver = driver;
 
 	if (readl(&dbc->regs->control) & DBC_CTRL_DBC_ENABLE)
-		return NULL;
+		goto err;
 
 	INIT_DELAYED_WORK(&dbc->event_work, xhci_dbc_handle_events);
 	spin_lock_init(&dbc->lock);
-- 
2.34.1

Re: [PATCH] xhci: dbc: Fix memory leak in xhci_alloc_dbc()

Posted by Mathias Nyman 3 years, 6 months ago

On 14.9.2022 5.36, Rafael Mendonca wrote:
> If DbC is already in use, then the allocated memory for the xhci_dbc struct
> doesn't get freed before returning NULL, which leads to a memleak.
> 
> Fixes: 534675942e90 ("xhci: dbc: refactor xhci_dbc_init()")
> Signed-off-by: Rafael Mendonca <rafaelmendsr@gmail.com>

Thanks, nice catch

Adding to queue

-Mathias