Skip to content

Commit bb9c74a

Browse files
jackp780gregkh
authored andcommitted
usb: dwc3: gadget: Free gadget structure only after freeing endpoints
As part of commit e81a701 ("usb: dwc3: allocate gadget structure dynamically") the dwc3_gadget_release() was added which will free the dwc->gadget structure upon the device's removal when usb_del_gadget_udc() is called in dwc3_gadget_exit(). However, simply freeing the gadget results a dangling pointer situation: the endpoints created in dwc3_gadget_init_endpoints() have their dep->endpoint.ep_list members chained off the list_head anchored at dwc->gadget->ep_list. Thus when dwc->gadget is freed, the first dwc3_ep in the list now has a dangling prev pointer and likewise for the next pointer of the dwc3_ep at the tail of the list. The dwc3_gadget_free_endpoints() that follows will result in a use-after-free when it calls list_del(). This was caught by enabling KASAN and performing a driver unbind. The recent commit 568262b ("usb: dwc3: core: Add shutdown callback for dwc3") also exposes this as a panic during shutdown. There are a few possibilities to fix this. One could be to perform a list_del() of the gadget->ep_list itself which removes it from the rest of the dwc3_ep chain. Another approach is what this patch does, by splitting up the usb_del_gadget_udc() call into its separate "del" and "put" components. This allows dwc3_gadget_free_endpoints() to be called before the gadget is finally freed with usb_put_gadget(). Fixes: e81a701 ("usb: dwc3: allocate gadget structure dynamically") Reviewed-by: Peter Chen <peter.chen@kernel.org> Signed-off-by: Jack Pham <jackp@codeaurora.org> Link: https://lore.kernel.org/r/20210501093558.7375-1-jackp@codeaurora.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 75a41ce commit bb9c74a

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/usb/dwc3/gadget.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4062,8 +4062,9 @@ int dwc3_gadget_init(struct dwc3 *dwc)
40624062

40634063
void dwc3_gadget_exit(struct dwc3 *dwc)
40644064
{
4065-
usb_del_gadget_udc(dwc->gadget);
4065+
usb_del_gadget(dwc->gadget);
40664066
dwc3_gadget_free_endpoints(dwc);
4067+
usb_put_gadget(dwc->gadget);
40674068
dma_free_coherent(dwc->sysdev, DWC3_BOUNCE_SIZE, dwc->bounce,
40684069
dwc->bounce_addr);
40694070
kfree(dwc->setup_buf);

0 commit comments

Comments
 (0)