Linux USB
 help / color / mirror / Atom feed
From: Michael Grzeschik <m.grzeschik@pengutronix.de>
To: laurent.pinchart@ideasonboard.com
Cc: linux-usb@vger.kernel.org, linux-media@vger.kernel.org,
	dan.scally@ideasonboard.com, gregkh@linuxfoundation.org,
	nicolas@ndufresne.ca, kernel@pengutronix.de
Subject: [PATCH 2/3] usb: gadget: uvc: cleanup request when not in correct state
Date: Mon, 11 Sep 2023 02:24:50 +0200	[thread overview]
Message-ID: <20230911002451.2860049-3-m.grzeschik@pengutronix.de> (raw)
In-Reply-To: <20230911002451.2860049-1-m.grzeschik@pengutronix.de>

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>
---
 drivers/usb/gadget/function/uvc_video.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c
index 4b6e854e30c58c..52e3666b51f743 100644
--- 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;
-- 
2.39.2


  parent reply	other threads:[~2023-09-11  0:25 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-11  0:24 [PATCH 0/3] usb: gadget: uvc: restart fixes Michael Grzeschik
2023-09-11  0:24 ` [PATCH 1/3] usb: gadget: uvc: stop pump thread on video disable Michael Grzeschik
2023-09-11  4:35   ` kernel test robot
2023-09-11  8:05   ` kernel test robot
2023-09-11  0:24 ` Michael Grzeschik [this message]
2023-09-12  4:52   ` [PATCH 2/3] usb: gadget: uvc: cleanup request when not in correct state Avichal Rakesh
2023-09-15 23:32     ` Michael Grzeschik
2023-09-16  2:41       ` Avichal Rakesh
2023-09-16 23:23         ` Michael Grzeschik
2023-09-18 19:02           ` Avichal Rakesh
2023-09-18 21:43             ` Michael Grzeschik
2023-09-18 23:40               ` Avichal Rakesh
2023-09-19  8:08                 ` Avichal Rakesh
2023-09-19 19:13                 ` Michael Grzeschik
2023-09-19 19:55                   ` Avichal Rakesh
2023-09-19 20:07                     ` Michael Grzeschik
2023-09-19 20:22                       ` Avichal Rakesh
2023-09-19 21:16                         ` Michael Grzeschik
2023-09-20 20:15                           ` Avichal Rakesh
2023-09-11  0:24 ` [PATCH 3/3] usb: gadget: uvc: rework pump worker to avoid while loop Michael Grzeschik

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=20230911002451.2860049-3-m.grzeschik@pengutronix.de \
    --to=m.grzeschik@pengutronix.de \
    --cc=dan.scally@ideasonboard.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=kernel@pengutronix.de \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=nicolas@ndufresne.ca \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox