commit b83ccb854feb59f2c4f877b41c4b1fd6c95b772b
author Jorge E. Moreira <jemoreira@google.com> Fri Feb 09 11:22:00 2018 -0800
committer Jorge E. Moreira <jemoreira@google.com> Wed Mar 14 18:46:41 2018 -0700
tree 6364faace59d51403ad02450cbfda8acfde316ca
parent 477277ce7e4a60b98523a178624ec729d560b876

Enabled layer sanity checks in hwcomposer's prepare too

(Taken from Change-Id: Id9e970f2fb80f7eeecd2b5924d1b8e7b238e1b1d)

Bug: 72998203
Test: local
Change-Id: I2ec6edde3e0de3336d80dda1a50cb375f16c6154

guest/hals/hwcomposer/legacy/vsoc_composer.cpp

diff --git a/guest/hals/hwcomposer/legacy/vsoc_composer.cpp b/guest/hals/hwcomposer/legacy/vsoc_composer.cpp
index 1eff72d..7d9856c 100644
--- a/guest/hals/hwcomposer/legacy/vsoc_composer.cpp
+++ b/guest/hals/hwcomposer/legacy/vsoc_composer.cpp
@@ -40,6 +40,10 @@
 
 // Ensures that the layer does not include any inconsistencies
 bool IsValidLayer(const vsoc_hwc_layer& layer) {
+  if (layer.flags & HWC_SKIP_LAYER) {
+    // A layer we are asked to skip is valid regardless of its contents
+    return true;
+  }
   // Check displayFrame
   if (layer.displayFrame.left > layer.displayFrame.right ||
       layer.displayFrame.top > layer.displayFrame.bottom) {
@@ -50,6 +54,13 @@
         layer.displayFrame.top, layer.displayFrame.bottom);
     return false;
   }
+  // Validate the handle
+  if (private_handle_t::validate(layer.handle) != 0) {
+    ALOGE("%s: Layer contains an invalid gralloc handle.", __FUNCTION__);
+    return false;
+  }
+  const private_handle_t* p_handle =
+      reinterpret_cast<const private_handle_t*>(layer.handle);
   // Check sourceCrop
   if (layer.sourceCrop.left > layer.sourceCrop.right ||
       layer.sourceCrop.top > layer.sourceCrop.bottom) {
@@ -60,12 +71,6 @@
         layer.sourceCrop.top, layer.sourceCrop.bottom);
     return false;
   }
-  if (private_handle_t::validate(layer.handle) != 0) {
-    ALOGE("%s: Layer contains an invalid gralloc handle.", __FUNCTION__);
-    return false;
-  }
-  const private_handle_t* p_handle =
-      reinterpret_cast<const private_handle_t*>(layer.handle);
   if (layer.sourceCrop.left < 0 || layer.sourceCrop.top < 0 ||
       layer.sourceCrop.right > p_handle->x_res ||
       layer.sourceCrop.bottom > p_handle->y_res) {
@@ -594,6 +599,10 @@
 VSoCComposer::~VSoCComposer() {}
 
 int VSoCComposer::PrepareLayers(size_t num_layers, vsoc_hwc_layer* layers) {
+  if (!IsValidComposition(num_layers, layers)) {
+    LOG_FATAL("%s: Invalid composition requested", __FUNCTION__);
+    return -1;
+  }
   int composited_layers_count = 0;
 
   // Loop over layers in inverse order of z-index