On 10/5/23 03:14, Michael Grzeschik wrote:
On Thu, Oct 05, 2023 at 11:23:27AM +0300, Laurent Pinchart wrote:
On Tue, Oct 03, 2023 at 01:09:06PM +0200, Michael Grzeschik wrote:
On Sat, Sep 30, 2023 at 11:48:18AM -0700, Avichal Rakesh wrote:
> We have been seeing two main stability issues that uvc gadget driver
> runs into when stopping streams:
> 1. Attempting to queue usb_requests to a disabled usb_ep
> 2. use-after-free issue for inflight usb_requests
>
> The three patches below fix the two issues above. Patch 1/3 fixes the
> first issue, and Patch 2/3 and 3/3 fix the second issue.
>
> Avichal Rakesh (3):
> usb: gadget: uvc: prevent use of disabled endpoint
> usb: gadget: uvc: Allocate uvc_requests one at a time
> usb: gadget: uvc: Fix use-after-free for inflight usb_requests
>
> drivers/usb/gadget/function/f_uvc.c | 11 +-
> drivers/usb/gadget/function/f_uvc.h | 2 +-
> drivers/usb/gadget/function/uvc.h | 6 +-
> drivers/usb/gadget/function/uvc_v4l2.c | 21 ++-
> drivers/usb/gadget/function/uvc_video.c | 189 +++++++++++++++++-------
> 5 files changed, 164 insertions(+), 65 deletions(-)
These patches are not applying on gregkh/usb-testing since
Greg did take my patches first. I have already rebased them.
I think they got merged too soon :-( We could fix things on top, but
there's very little time to do so for v6.7.
Agreed. I was jumping from one workaround to another one, since this
is not easy to fix in a proper way. And still after this long discussion
with Avichal I don't think we are there yet.
So far the first two patches from Avichal look legit. But the overall
Use-After-Free fix is yet to be done properly.
The "abondoned" method he suggested is really bad to follow and will
add too much complexity and will be hard to debug.
IMHO it should be possible to introduce two cleanup pathes.
One path would be in the uvc_cleanup_requests that will cleanup the
requests that are actually not used in the controller and are registered
in the req_free list.
The second path would be the complete functions that are being run
from the controller and will ensure that the cleanup will really free
the requests from the controller after they were consumed.
What do you think?
I am not sure I follow. Patch 3/3 does exactly what you say here.
There are two cleanup paths:
1. uvcg_video_disable cleans up only the requests in req_free, and
2. complete handler cleans up the in-flight requests.
The "abandoned" flag is simply to let the completion handler know
which requests to clean up and which ones to re-queue back to
the gadget driver.
The other "complications" are around making sure we can trust
the values in an inherently racey situation. The reasoning
can admittedly be difficult to follow at a glance, which incidentally
is why I went with a simple to prove timed wait in the past
(https://lore.kernel.org/20230912041910.726442-3-arakesh@xxxxxxxxxx).
I am not suggesting we go back to a timed wait, but please do look
at the patch and let me know which parts don't make sense, or are
difficult to understand. We can add more documentation about our
assumptions there, or if you have a way to do this that you
think is simpler to reason about, then please let me know and I'll
be more than happy to use that!
Attachment:
signature.asc
Description: PGP signature