From: Mathias Nyman <mathias.nyman@linux.intel.com>
To: <gregkh@linuxfoundation.org>
Cc: <linux-usb@vger.kernel.org>,
Rafael Mendonca <rafaelmendsr@gmail.com>,
stable@vger.kernel.org,
Mathias Nyman <mathias.nyman@linux.intel.com>
Subject: [PATCH 2/6] xhci: dbc: Fix memory leak in xhci_alloc_dbc()
Date: Wed, 21 Sep 2022 15:34:46 +0300 [thread overview]
Message-ID: <20220921123450.671459-3-mathias.nyman@linux.intel.com> (raw)
In-Reply-To: <20220921123450.671459-1-mathias.nyman@linux.intel.com>
From: Rafael Mendonca <rafaelmendsr@gmail.com>
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()")
Cc: stable@vger.kernel.org
Signed-off-by: Rafael Mendonca <rafaelmendsr@gmail.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.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.25.1
next prev parent reply other threads:[~2022-09-21 12:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-21 12:34 [PATCH 0/6] xhci features and fixes for usb-next Mathias Nyman
2022-09-21 12:34 ` [PATCH 1/6] usb: host: xhci: Fix potential memory leak in xhci_alloc_stream_info() Mathias Nyman
2022-09-21 12:34 ` Mathias Nyman [this message]
2022-09-21 12:34 ` [PATCH 3/6] xhci: Don't show warning for reinit on known broken suspend Mathias Nyman
2022-09-21 12:34 ` [PATCH 4/6] xhci: show fault reason for a failed enable slot command Mathias Nyman
2022-09-21 12:34 ` [PATCH 5/6] xhci: remove unused command member from struct xhci_hcd struct Mathias Nyman
2022-09-21 12:34 ` [PATCH 6/6] xhci: remove unused lpm_failed_dev member from struct xhci_hcd Mathias Nyman
2022-09-22 12:08 ` [PATCH 0/6] xhci features and fixes for usb-next Greg KH
2022-09-22 12:43 ` Mathias Nyman
2022-09-22 12:52 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220921123450.671459-3-mathias.nyman@linux.intel.com \
--to=mathias.nyman@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
--cc=rafaelmendsr@gmail.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.