| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CANiDSCv=X_KHFwKy-hWfVSn=EgmxirQXB3dUmGvYpE7eySL=9g@mail.gmail.com>
Date: Mon, 2 Jan 2023 15:44:51 +0100
From: Ricardo Ribalda <ribalda@...omium.org>
To: Laurent Pinchart <laurent.pinchart@...asonboard.com>
Cc: Sergey Senozhatsky <senozhatsky@...omium.org>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
Max Staudt <mstaudt@...gle.com>, linux-media@...r.kernel.org,
stable@...r.kernel.org, linux-kernel@...r.kernel.org,
Yunke Cao <yunkec@...omium.org>
Subject: Re: [PATCH v5] media: uvcvideo: Fix race condition with usb_kill_urb
Hi Laurent
On Mon, 2 Jan 2023 at 15:28, Laurent Pinchart
<laurent.pinchart@...asonboard.com> wrote:
>
> Hi Ricardo,
>
> Thank you for the patch.
>
> On Mon, Jan 02, 2023 at 01:53:38PM +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@...r.kernel.org
> > Fixes: e5225c820c05 ("media: uvcvideo: Send a control event when a Control Change interrupt arrives")
> > Reviewed-by: Yunke Cao <yunkec@...omium.org>
> > Signed-off-by: Ricardo Ribalda <ribalda@...omium.org>
> > ---
> > uvc: Fix race condition on uvc
> >
> > Make sure that all the async work is finished when we stop the status urb.
> >
> > To: Yunke Cao <yunkec@...omium.org>
> > To: Sergey Senozhatsky <senozhatsky@...omium.org>
> > To: Max Staudt <mstaudt@...gle.com>
> > To: Laurent Pinchart <laurent.pinchart@...asonboard.com>
> > To: Mauro Carvalho Chehab <mchehab@...nel.org>
> > Cc: linux-media@...r.kernel.org
> > Cc: linux-kernel@...r.kernel.org
> > ---
> > Changes in v5:
> > - atomic_t do not impose barriers, use smp_mb() instead. (Thanks Laurent)
> > - Add an extra cancel_work_sync().
> > - Link to v4: https://lore.kernel.org/r/20221212-uvc-race-v4-0-38d7075b03f5@chromium.org
> >
> > Changes in v4:
> > - Replace bool with atomic_t to avoid compiler reordering.
> > - First complete the async work and then kill the urb to avoid race (Thanks Laurent!)
> > - Link to v3: https://lore.kernel.org/r/20221212-uvc-race-v3-0-954efc752c9a@chromium.org
> >
> > Changes in v3:
> > - Remove the patch for dev->status, makes more sense in another series, and makes
> > the zero day less nervous.
> > - Update reviewed-by (thanks Yunke!).
> > - Link to v2: https://lore.kernel.org/r/20221212-uvc-race-v2-0-54496cc3b8ab@chromium.org
> >
> > Changes in v2:
> > - Add a patch for not kalloc dev->status
> > - Redo the logic mechanism, so it also works with suspend (Thanks Yunke!)
> > - Link to v1: https://lore.kernel.org/r/20221212-uvc-race-v1-0-c52e1783c31d@chromium.org
> > ---
> > drivers/media/usb/uvc/uvc_ctrl.c | 3 +++
> > drivers/media/usb/uvc/uvc_status.c | 36 ++++++++++++++++++++++++++++++++++++
> > drivers/media/usb/uvc/uvcvideo.h | 1 +
> > 3 files changed, 40 insertions(+)
> >
> > diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
> > index c95a2229f4fa..5160facc8e20 100644
> > --- a/drivers/media/usb/uvc/uvc_ctrl.c
> > +++ b/drivers/media/usb/uvc/uvc_ctrl.c
> > @@ -1442,6 +1442,9 @@ static void uvc_ctrl_status_event_work(struct work_struct *work)
> >
> > uvc_ctrl_status_event(w->chain, w->ctrl, w->data);
> >
> > + if (dev->flush_status)
> > + return;
> > +
> > /* Resubmit the URB. */
> > w->urb->interval = dev->int_ep->desc.bInterval;
> > ret = usb_submit_urb(w->urb, GFP_KERNEL);
> > diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc_status.c
> > index 7518ffce22ed..5911e63776e1 100644
> > --- a/drivers/media/usb/uvc/uvc_status.c
> > +++ b/drivers/media/usb/uvc/uvc_status.c
> > @@ -6,6 +6,7 @@
> > * Laurent Pinchart (laurent.pinchart@...asonboard.com)
> > */
> >
> > +#include <asm/barrier.h>
> > #include <linux/kernel.h>
> > #include <linux/input.h>
> > #include <linux/slab.h>
> > @@ -309,5 +310,40 @@ int uvc_status_start(struct uvc_device *dev, gfp_t flags)
> >
> > void uvc_status_stop(struct uvc_device *dev)
> > {
> > + struct uvc_ctrl_work *w = &dev->async_ctrl;
> > +
> > + /* From this point, the status urb is not re-queued */
> > + dev->flush_status = 1;
>
> flush_status is now a bool, set it to true instead of 1. Same below for
> false instead of 0.
>
> > + /*
> > + * Make sure that the other CPUs are aware of the new value of
> > + * flush_status.
> > + */
> > + smp_mb();
>
> /*
> * Prevent to asynchronous control handler from requeing the URB. The
> * barrier is needed the flush_status change is visible to other CPUs
> * running the asynchronous handler before usb_kill_urb() is called
> * below.
> */
> dev->flush_status = true;
> smp_mb();
>
> > +
> > + /* If there is any status event on the queue, process it. */
> > + if (cancel_work_sync(&w->work))
> > + uvc_ctrl_status_event(w->chain, w->ctrl, w->data);
> > +
> > + /* Kill the urb. */
> > usb_kill_urb(dev->int_urb);
> > +
> > + /*
> > + * If an status event was queued between cancel_work_sync() and
> > + * usb_kill_urb(), process it.
> > + */
>
> /*
> * The URB completion handler may have queued asynchronous work. This
> * won't resubmit the URB as flush_status is set, but it needs to be
> * cancelled before returning or it could then race with a future
> * uvc_status_start() call.
> */
>
> > + if (cancel_work_sync(&w->work))
> > + uvc_ctrl_status_event(w->chain, w->ctrl, w->data);
>
> I think I'd still prefer checking flush_status in
> uvc_ctrl_status_event_async() and drop the event, as it would be simpler
> here. uvc_status_stop() is called when the last user indicates it's not
> interested in events anymore (by closing the device at the moment,
> possibly by unsubscribing from events in the future), so dropping the
> event isn't a problem as far as I can tell. What do you think ?
Since the user do not have direct control to when uvc_status_stop is
called, I prefer to have the second cancel_work_sync() here. That will
give us more flexibility when we rework the power saving.
Also, uvc_status_stop is done only once and not in IRQ context. the
change you propose will make the irq context bigger.... Yes I know it
is only one if, but I had to say something :P
>
> > +
> > + /*
> > + * From this point, there are no events on the queue and the status urb
>
> s/urb/URB/
>
> > + * is dead, this is, no events will be queued until uvc_status_start()
> > + * is called.
> > + */
> > + dev->flush_status = 0;
> > + /*
> > + * Write to memory the value of flush_status before uvc_status_start()
> > + * is called again,
>
> s/,/./
>
> > + */
> > + smp_mb();
>
> /*
> * From this point, the status URB is dead, and no asynchronous work is
> * queued. No event will be processed until uvc_status_start() is
> * called. Reset flush_status and make it visible to the asynchronous
> * handler before uvc_status_start() requeues the status URB.
> */
> dev->flush_status = 0;
> smp_mb();
>
> The barrier here is most likely overkill given that I'd be very
> surprised if a URB could be queued, followed by a work item being
> queued, without any memory barrier, but it's good to be explicit I
> suppose :-)
>
> > +
>
> Drop the blank line.
>
> > }
> > diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
> > index df93db259312..6a9b72d6789e 100644
> > --- a/drivers/media/usb/uvc/uvcvideo.h
> > +++ b/drivers/media/usb/uvc/uvcvideo.h
> > @@ -560,6 +560,7 @@ struct uvc_device {
> > struct usb_host_endpoint *int_ep;
> > struct urb *int_urb;
> > u8 *status;
> > + bool flush_status;
> > struct input_dev *input;
> > char input_phys[64];
> >
> >
> > ---
> > base-commit: 0ec5a38bf8499f403f81cb81a0e3a60887d1993c
> > change-id: 20221212-uvc-race-09276ea68bf8
>
> --
> Regards,
>
> Laurent Pinchart
--
Ricardo Ribalda
Powered by blists - more mailing lists