commit 2c3a2456d98b60ca897208a0799b9dd1cff0be94
author Prashant Malani <pmalani@google.com> Thu Jan 12 18:12:11 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 12 18:12:11 2017 +0000
tree 5d9a952553dcf4a1302bb66e40565ba002526396
parent 45395ed3f535eb1533993cf462f46ba6c4d6fec6
parent eca8d970bdd3260939e625eaf00d94423cd7f6db

Merge "fs_mgr: Fix disable-verity for verifyatboot partitions" am: 6bc1d38381 am: ab27993c18
am: 6635787941

Change-Id: I37c2c5d200c4c4fe349fdb32f97e1c1158b762d8

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