From: Greg KH <greg@kroah.com>
To: Ricardo Ribalda <ribalda@chromium.org>
Cc: stable@vger.kernel.org, Yunke Cao <yunkec@chromium.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Subject: Re: [PATCH 6.2.y] media: uvcvideo: Fix race condition with usb_kill_urb
Date: Fri, 10 Mar 2023 13:17:47 +0100 [thread overview]
Message-ID: <ZAsf6wksYtH9/Ura@kroah.com> (raw)
In-Reply-To: <ZAsaiH4YhwHSDHOO@kroah.com>
On Fri, Mar 10, 2023 at 12:54:48PM +0100, Greg KH wrote:
> On Wed, Mar 08, 2023 at 02:30:25PM +0100, Ricardo Ribalda wrote:
> > usb_kill_urb warranties that all the handlers are finished when it
> > returns, but does not protect against threads that might be handling
> > asynchronously the urb.
> >
> > For UVC, the function uvc_ctrl_status_event_async() takes care of
> > control changes asynchronously.
> >
> > If the code is executed in the following order:
> >
> > CPU 0 CPU 1
> > ===== =====
> > uvc_status_complete()
> > uvc_status_stop()
> > uvc_ctrl_status_event_work()
> > uvc_status_start() -> FAIL
> >
> > Then uvc_status_start will keep failing and this error will be shown:
> >
> > <4>[ 5.540139] URB 0000000000000000 submitted while active
> > drivers/usb/core/urb.c:378 usb_submit_urb+0x4c3/0x528
> >
> > Let's improve the current situation, by not re-submiting the urb if
> > we are stopping the status event. Also process the queued work
> > (if any) during stop.
> >
> > CPU 0 CPU 1
> > ===== =====
> > uvc_status_complete()
> > uvc_status_stop()
> > uvc_status_start()
> > uvc_ctrl_status_event_work() -> FAIL
> >
> > Hopefully, with the usb layer protection this should be enough to cover
> > all the cases.
> >
> > Cc: stable@vger.kernel.org
> > Fixes: e5225c820c05 ("media: uvcvideo: Send a control event when a Control Change interrupt arrives")
> > Reviewed-by: Yunke Cao <yunkec@chromium.org>
> > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > (cherry picked from commit 619d9b710cf06f7a00a17120ca92333684ac45a8)
> > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
> > ---
> > drivers/media/usb/uvc/uvc_ctrl.c | 5 ++++
> > drivers/media/usb/uvc/uvc_status.c | 37 ++++++++++++++++++++++++++++++
> > drivers/media/usb/uvc/uvcvideo.h | 1 +
> > 3 files changed, 43 insertions(+)
>
> This fails to apply to the 6.2.y queue right now:
>
> checking file drivers/media/usb/uvc/uvc_ctrl.c
> Hunk #1 FAILED at 6.
> Hunk #2 succeeded at 1509 (offset 67 lines).
> 1 out of 2 hunks FAILED
> checking file drivers/media/usb/uvc/uvc_status.c
> checking file drivers/media/usb/uvc/uvcvideo.h
> Hunk #1 succeeded at 559 (offset -1 lines).
>
> Can you redo this?
I got 5.15.y and newer to work here on my own, can you redo the older
ones as well?
thanks,
greg k-h
next prev parent reply other threads:[~2023-03-10 12:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-06 10:56 FAILED: patch "[PATCH] media: uvcvideo: Fix race condition with usb_kill_urb" failed to apply to 6.2-stable tree gregkh
2023-03-08 13:30 ` [PATCH 6.2.y] media: uvcvideo: Fix race condition with usb_kill_urb Ricardo Ribalda
2023-03-10 11:54 ` Greg KH
2023-03-10 12:17 ` Greg KH [this message]
2023-03-10 12:18 ` Ricardo Ribalda
2023-03-10 12:05 ` Ricardo Ribalda
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=ZAsf6wksYtH9/Ura@kroah.com \
--to=greg@kroah.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=ribalda@chromium.org \
--cc=stable@vger.kernel.org \
--cc=yunkec@chromium.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox