diff options
| author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2019-01-30 05:09:41 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-07-09 22:03:55 +0100 |
| commit | 820ea17e47d0aea57279053d2c8f01ccadbf038c (patch) | |
| tree | f11f1e6bb9118f2fc35f6a84a1f8c3582fd00c54 | |
| parent | 78c05c04a74b47b21c4723cf907338db9f4e40a9 (diff) | |
| download | linux-stable-820ea17e47d0aea57279053d2c8f01ccadbf038c.tar.gz linux-stable-820ea17e47d0aea57279053d2c8f01ccadbf038c.tar.bz2 linux-stable-820ea17e47d0aea57279053d2c8f01ccadbf038c.zip | |
media: uvcvideo: Avoid NULL pointer dereference at the end of streaming
commit 9dd0627d8d62a7ddb001a75f63942d92b5336561 upstream.
The UVC video driver converts the timestamp from hardware specific unit
to one known by the kernel at the time when the buffer is dequeued. This
is fine in general, but the streamoff operation consists of the
following steps (among other things):
1. uvc_video_clock_cleanup --- the hardware clock sample array is
released and the pointer to the array is set to NULL,
2. buffers in active state are returned to the user and
3. buf_finish callback is called on buffers that are prepared.
buf_finish includes calling uvc_video_clock_update that accesses the
hardware clock sample array.
The above is serialised by a queue specific mutex. Address the problem
by skipping the clock conversion if the hardware clock sample array is
already released.
Fixes: 9c0863b1cc48 ("[media] vb2: call buf_finish from __queue_cancel")
Reported-by: Chiranjeevi Rapolu <chiranjeevi.rapolu@intel.com>
Tested-by: Chiranjeevi Rapolu <chiranjeevi.rapolu@intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/media/usb/uvc/uvc_video.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 983c24a70ff5..0e2a9d732c2d 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -627,6 +627,14 @@ void uvc_video_clock_update(struct uvc_streaming *stream, u32 rem; u64 y; + /* + * We will get called from __vb2_queue_cancel() if there are buffers + * done but not dequeued by the user, but the sample array has already + * been released at that time. Just bail out in that case. + */ + if (!clock->samples) + return; + spin_lock_irqsave(&clock->lock, flags); if (clock->count < clock->size) |