commit 9eacc51ea1b6cb9d00a15a478dc8e04c42ec37c0
author Linux Build Service Account <lnxbuild@quicinc.com> Tue Aug 08 22:27:30 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Aug 08 22:27:30 2017 -0700
tree af0ecbbc0d5b675a46975344676367ae20e84f13
parent 17adfb7d60d6a76303e51d9b8e57090d032ef06f
parent ab76820e8827acaaf9f5a42976e440c8d05016ec

Merge "hwc2: validate display id in SetColorModeById"

sdm/libs/hwc2/hwc_session.cpp

diff --git a/sdm/libs/hwc2/hwc_session.cpp b/sdm/libs/hwc2/hwc_session.cpp
index 7e99f29..f7462d1 100644
--- a/sdm/libs/hwc2/hwc_session.cpp
+++ b/sdm/libs/hwc2/hwc_session.cpp
@@ -1161,6 +1161,11 @@
   auto display = static_cast<hwc2_display_t >(input_parcel->readInt32());
   auto mode = input_parcel->readInt32();
   auto device = static_cast<hwc2_device_t *>(this);
+
+  if (display > HWC_DISPLAY_VIRTUAL) {
+    return -EINVAL;
+  }
+
   auto err = CallDisplayFunction(device, display, &HWCDisplay::SetColorModeById, mode);
   if (err != HWC2_ERROR_NONE)
     return -EINVAL;