usb: gadget: uvc: cleanup request when not in correct state

The uvc_video_enable function of the uvc-gadget driver is dequeing and
immediately deallocs all requests on its disable codepath. This is not
save since the dequeue function is async and does not ensure that the
requests are left unlinked in the controller driver.

By adding the ep_free_request into the completion path of the requests
we ensure that the request will be properly deallocated.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Link: https://lore.kernel.org/r/20230911140530.2995138-3-m.grzeschik@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c
index 4b68a3a9815d7339621b3b226271710049a2ae62..c48c904f500fff8cab29f9bebecc26537cb2b3e9 100644 (file)
--- a/drivers/usb/gadget/function/uvc_video.c
+++ b/drivers/usb/gadget/function/uvc_video.c
@@ -256,6 +256,12 @@ uvc_video_complete(struct usb_ep *ep, struct usb_request *req)
        struct uvc_device *uvc = video->uvc;
        unsigned long flags;
 
+       if (uvc->state == UVC_STATE_CONNECTED) {
+               usb_ep_free_request(video->ep, ureq->req);
+               ureq->req = NULL;
+               return;
+       }
+
        switch (req->status) {
        case 0:
                break;