commit 726516527c79595831f14d02ffb06d6a91b0c30a
author Mark Salyzyn <salyzyn@google.com> Fri Jan 13 15:56:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 13 15:56:20 2017 +0000
tree 5df79f5913f51c1f5ee88f0ed9f2a0f3415d6db9
parent c0cfe38ef785259592846d957fa03e68c8977b37
parent ea25332df3a407e182d0d4d149dfe6b521475308

Merge "trusty: use log/log.h for ALOG macros" am: dc40813167 am: 8548d54b2f
am: 3d6a3d2a13

Change-Id: Idbd1c1556d3867c9b9a0247c845530b2cb16fc47

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);