summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2025-08-29 14:58:45 -0600
committerTom Rini <trini@konsulko.com>2025-08-29 14:58:45 -0600
commite4c8b32d03d7ecffd586b7d33336603ad639d7c0 (patch)
treea124024b798820a20d9ae66d04971971c0ff8f65
parent3dc5e9a0108bb114175b6362f9cb22367402f624 (diff)
parentae2cd1b52d4ded22ac2359964c5682b5a5c1cc28 (diff)
Merge branch 'master' of git://source.denx.de/u-boot-usb
- Fix a use after free error in cdns3 gadget support in some cases.
-rw-r--r--drivers/usb/cdns3/gadget.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c
index a30c40ef80e..9eaf7e40ab6 100644
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@ -557,10 +557,10 @@ static void cdns3_wa2_remove_old_request(struct cdns3_endpoint *priv_ep)
trace_cdns3_wa2(priv_ep, "removes eldest request");
+ list_del_init(&priv_req->list);
kfree(priv_req->request.buf);
cdns3_gadget_ep_free_request(&priv_ep->endpoint,
&priv_req->request);
- list_del_init(&priv_req->list);
--priv_ep->wa2_counter;
if (!chain)
@@ -1959,10 +1959,10 @@ static int cdns3_gadget_ep_disable(struct usb_ep *ep)
while (!list_empty(&priv_ep->wa2_descmiss_req_list)) {
priv_req = cdns3_next_priv_request(&priv_ep->wa2_descmiss_req_list);
+ list_del_init(&priv_req->list);
kfree(priv_req->request.buf);
cdns3_gadget_ep_free_request(&priv_ep->endpoint,
&priv_req->request);
- list_del_init(&priv_req->list);
--priv_ep->wa2_counter;
}