commit d0b6eb6a3b3508f34b509cf767b1cb4e57e61c14
author Elliott Hughes <enh@google.com> Sat Jan 14 03:00:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jan 14 03:00:24 2017 +0000
tree 89bdd2d1ebc3aa347f637d61332a3be4e1fd3747
parent cd57135103640045e74101d5cb2e7b4b38b4bdbe
parent 35eb69bfd16b24bab1099854e363eb664e549452

Merge "-e is really about TCP/IP devices, not emulators." am: f28f7c8a74 am: 5bdade8a93
am: cf24be99bb

Change-Id: I7d3bd8f949d4b7607747916b541b8c2b80807598

gatekeeperd/gatekeeperd.cpp

diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp
index d4a92e5..96bda07 100644
--- a/gatekeeperd/gatekeeperd.cpp
+++ b/gatekeeperd/gatekeeperd.cpp
@@ -166,7 +166,14 @@
                     enrolled_password_handle, enrolled_password_handle_length);
         }
 
-        if (ret == 0) {
+        if (ret == GATEKEEPER_RESPONSE_OK && (*enrolled_password_handle == nullptr ||
+            *enrolled_password_handle_length != sizeof(password_handle_t))) {
+            ret = GATEKEEPER_RESPONSE_ERROR;
+            ALOGE("HAL: password_handle=%p size_of_handle=%" PRIu32 "\n",
+                  *enrolled_password_handle, *enrolled_password_handle_length);
+        }
+
+        if (ret == GATEKEEPER_RESPONSE_OK) {
             gatekeeper::password_handle_t *handle =
                     reinterpret_cast<gatekeeper::password_handle_t *>(*enrolled_password_handle);
             store_sid(uid, handle->user_id);