commit e0be6a90434d645a8b8351bda8a49a18ffb6e1df
author raylinhsu <raylinhsu@google.com> Wed Apr 22 00:06:50 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 22 00:06:50 2020 +0000
tree 205af2096317aca5c25b3432b2321c7fe3aa49ad
parent a3cc9570b1fcfc1d702a61d6baa7ce9735c75095
parent 9c248775d3ac7b409488c7c57309b429731b0290

gralloc: Additional buffer validation in getTransportSize am: 9c248775d3

Change-Id: I4b9a0c91a0d38b01d11c4544afa6bdb24ddd4fcc

gralloc/QtiMapper.cpp

diff --git a/gralloc/QtiMapper.cpp b/gralloc/QtiMapper.cpp
index 8065536..ee1d36f 100644
--- a/gralloc/QtiMapper.cpp
+++ b/gralloc/QtiMapper.cpp
@@ -245,13 +245,15 @@
   auto err = Error::BAD_BUFFER;
   auto hnd = static_cast<private_handle_t *>(buffer);
   uint32_t num_fds = 0, num_ints = 0;
-  if (buffer != nullptr && private_handle_t::validate(hnd) == 0) {
+  if (buffer != nullptr && private_handle_t::validate(hnd) == 0 &&
+      buf_mgr_->IsBufferImported(hnd) == Error::NONE) {
     num_fds = 2;
     // TODO(user): reduce to transported values;
     num_ints = static_cast<uint32_t >(hnd->numInts);
     err = Error::NONE;
   }
-  ALOGD_IF(DEBUG, "GetTransportSize: num fds: %d num ints: %d err:%d", num_fds, num_ints, err);
+  ALOGD_IF(DEBUG, "GetTransportSize: num fds: %d num ints: %d IsBufferImported:%d err:%d",
+                   num_fds, num_ints, buf_mgr_->IsBufferImported(hnd), err);
   hidl_cb(err, num_fds, num_ints);
   return Void();
 }