commit abf236b541b685f71acbeafc3c533a316b2b3f30
author Linux Build Service Account <lnxbuild@quicinc.com> Tue Nov 28 20:22:44 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Nov 28 20:22:44 2017 -0800
tree e057aa5df72b50161baaf6f0f53783caf2464590
parent 1237f07ce0b7d1af107416d4eeb9adcffeb46d7c
parent 6b05e5d03b69437bcd64b83c6a818429159d3440

Merge "hwc2: Fix out of bound check in getDisplayAttributes()"

sdm/libs/hwc2/hwc_session_services.cpp

diff --git a/sdm/libs/hwc2/hwc_session_services.cpp b/sdm/libs/hwc2/hwc_session_services.cpp
index 0fbba4d..f4241e0 100644
--- a/sdm/libs/hwc2/hwc_session_services.cpp
+++ b/sdm/libs/hwc2/hwc_session_services.cpp
@@ -234,19 +234,21 @@
   IDisplayConfig::DisplayAttributes display_attributes = {};
   int disp_id = MapDisplayType(dpy);
 
-  SEQUENCE_WAIT_SCOPE_LOCK(locker_[disp_id]);
-  if (disp_id >= 0 && hwc_display_[disp_id]) {
-    DisplayConfigVariableInfo hwc_display_attributes;
-    error = hwc_display_[disp_id]->GetDisplayAttributesForConfig(static_cast<int>(configIndex),
-                                                                 &hwc_display_attributes);
-    if (!error) {
-      display_attributes.vsyncPeriod = hwc_display_attributes.vsync_period_ns;
-      display_attributes.xRes = hwc_display_attributes.x_pixels;
-      display_attributes.yRes = hwc_display_attributes.y_pixels;
-      display_attributes.xDpi = hwc_display_attributes.x_dpi;
-      display_attributes.yDpi = hwc_display_attributes.y_dpi;
-      display_attributes.panelType = IDisplayConfig::DisplayPortType::DISPLAY_PORT_DEFAULT;
-      display_attributes.isYuv = hwc_display_attributes.is_yuv;
+  if (disp_id >= HWC_DISPLAY_PRIMARY && disp_id < HWC_NUM_DISPLAY_TYPES) {
+    SEQUENCE_WAIT_SCOPE_LOCK(locker_[disp_id]);
+    if (hwc_display_[disp_id]) {
+      DisplayConfigVariableInfo hwc_display_attributes;
+      error = hwc_display_[disp_id]->GetDisplayAttributesForConfig(static_cast<int>(configIndex),
+                                                                   &hwc_display_attributes);
+      if (!error) {
+        display_attributes.vsyncPeriod = hwc_display_attributes.vsync_period_ns;
+        display_attributes.xRes = hwc_display_attributes.x_pixels;
+        display_attributes.yRes = hwc_display_attributes.y_pixels;
+        display_attributes.xDpi = hwc_display_attributes.x_dpi;
+        display_attributes.yDpi = hwc_display_attributes.y_dpi;
+        display_attributes.panelType = IDisplayConfig::DisplayPortType::DISPLAY_PORT_DEFAULT;
+        display_attributes.isYuv = hwc_display_attributes.is_yuv;
+      }
     }
   }