diff options
| -rw-r--r-- | src/libcamera/v4l2_videodevice.cpp | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index 837a59d9..9b3ee887 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -1654,9 +1654,28 @@ FrameBuffer *V4L2VideoDevice::dequeueBuffer() LOG(V4L2, Debug) << "Dequeuing buffer " << buf.index; + /* + * If the video node fails to stream-on successfully (which can occur + * when queuing a buffer), a vb2 kernel bug can lead to the buffer which + * returns a failure upon queuing being mistakenly kept in the kernel. + * This leads to the kernel notifying us that a buffer is available to + * dequeue, which we have no awareness of being queued, and thus we will + * not find it in the queuedBuffers_ list. + * + * Whilst this kernel bug has been fixed in mainline, ensure that we + * safely ingore buffers which are unexpected to prevetn crashes on + * older kernels. + */ + auto it = queuedBuffers_.find(buf.index); + if (it == queuedBuffers_.end()) { + LOG(V4L2, Error) + << "Dequeued unexpected buffer index " << buf.index; + + return nullptr; + } + cache_->put(buf.index); - auto it = queuedBuffers_.find(buf.index); FrameBuffer *buffer = it->second; queuedBuffers_.erase(it); |