summaryrefslogtreecommitdiff
path: root/src/android/camera_device.cpp
diff options
context:
space:
mode:
authorHirokazu Honda <hiroh@chromium.org>2021-12-01 16:53:46 +0900
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-12-01 13:46:56 +0200
commitf6807016a37fc11f8c93f105569f04fa1a2326e7 (patch)
tree33abb20b1bd415cb5809765216709cac0789d403 /src/android/camera_device.cpp
parent97ab0074ec3097da1923294e4ef4c2f815532c4a (diff)
android: camera_device: Fix variables access without protection
This fixes the code accessing descriptors and Camera3RequestDescriptor::pendingStreamsToProcess_ without holding descriptorsMutex_ and Camera3RequestDescriptor::streamProcessMutex_ in CameraDevice. Signed-off-by: Hirokazu Honda <hiroh@chromium.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Umang Jain <umang.jain@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/android/camera_device.cpp')
-rw-r--r--src/android/camera_device.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index c7686557..db400e74 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -436,7 +436,11 @@ void CameraDevice::stop()
worker_.stop();
camera_->stop();
- descriptors_ = {};
+ {
+ MutexLocker descriptorsLock(descriptorsMutex_);
+ descriptors_ = {};
+ }
+
streams_.clear();
state_ = State::Stopped;
@@ -933,6 +937,9 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques
*/
FrameBuffer *frameBuffer = nullptr;
int acquireFence = -1;
+
+ MutexLocker lock(descriptor->streamsProcessMutex_);
+
switch (cameraStream->type()) {
case CameraStream::Type::Mapped:
/*