commit e81e0c1a8f1422ee5a1e2cb4f3fbf3c9b8d65a1e
author Rheygine Medel <quic_rmedel@quicinc.com> Wed Aug 31 17:12:46 2022 -0700
committer V S Ganga VaraPrasad (VARA) Adabala <quic_vadabala@quicinc.com> Sat Sep 24 14:18:47 2022 +0530
tree 553ef8c93e526916099d634f8bdd64c61e9e431b
parent c1a6cb5ba9c3b5c02c77c77d9ce2d2a74d408ed9

sde-drm: Protect access to tmp_prop_val_map_ to avoid crash

DRMPlane's map (tmp_prop_val_map_) can be accessed by multiple
threads simultaneously which can cause deadlocks or segfault
errors. This changes adds a mutex lock to protect access to
the object to avoid such scenarios.

Change-Id: I8bc4de83a9fd24d431739f811b0297ba84b1fd83
CRs-Fixed: 3275492

sde-drm/drm_plane.cpp

diff --git a/sde-drm/drm_plane.cpp b/sde-drm/drm_plane.cpp
index 57b7bbe..c318e79 100644
--- a/sde-drm/drm_plane.cpp
+++ b/sde-drm/drm_plane.cpp
@@ -382,6 +382,7 @@
 DRMPlaneManager::DRMPlaneManager(int fd) : fd_(fd) {}
 
 void DRMPlaneManager::Init() {
+  lock_guard<mutex> lock(lock_);
   drmModePlaneRes *resource = drmModeGetPlaneResources(fd_);
   if (!resource) {
     return;
@@ -408,10 +409,12 @@
 }
 
 void DRMPlaneManager::DumpByID(uint32_t id) {
+  lock_guard<mutex> lock(lock_);
   plane_pool_.at(id)->Dump();
 }
 
 void DRMPlaneManager::Perform(DRMOps code, uint32_t obj_id, drmModeAtomicReq *req, va_list args) {
+  lock_guard<mutex> lock(lock_);
   auto it = plane_pool_.find(obj_id);
   if (it == plane_pool_.end()) {
     DRM_LOGE("Invalid plane id %d", obj_id);
@@ -437,12 +440,14 @@
 }
 
 void DRMPlaneManager::DumpAll() {
+  lock_guard<mutex> lock(lock_);
   for (uint32_t i = 0; i < plane_pool_.size(); i++) {
     plane_pool_[i]->Dump();
   }
 }
 
 void DRMPlaneManager::GetPlanesInfo(DRMPlanesInfo *info) {
+  lock_guard<mutex> lock(lock_);
   for (auto &plane : plane_pool_) {
     info->push_back(std::make_pair(plane.first, plane.second->GetPlaneTypeInfo()));
   }
@@ -467,6 +472,7 @@
 }
 
 void DRMPlaneManager::RetainPlanes(uint32_t crtc_id) {
+  lock_guard<mutex> lock(lock_);
   for (auto &plane : plane_pool_) {
     uint32_t assigned_crtc = 0;
     plane.second->GetAssignedCrtc(&assigned_crtc);
@@ -495,6 +501,7 @@
 }
 
 void DRMPlaneManager::SetScalerLUT(const DRMScalerLUTInfo &lut_info) {
+  lock_guard<mutex> lock(lock_);
   if (lut_info.dir_lut_size) {
     drmModeCreatePropertyBlob(fd_, reinterpret_cast<void *>(lut_info.dir_lut),
                               lut_info.dir_lut_size, &dir_lut_blob_id_);
@@ -510,6 +517,7 @@
 }
 
 void DRMPlaneManager::UnsetScalerLUT() {
+  lock_guard<mutex> lock(lock_);
   if (dir_lut_blob_id_) {
     drmModeDestroyPropertyBlob(fd_, dir_lut_blob_id_);
     dir_lut_blob_id_ = 0;