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

Merge "fs_mgr: Add support for at-boot verification" am: 82db553dd9 am: e36462f0f5
am: de4b9427e1

Change-Id: I2c31c6be028f034693643a3424c477ee9ae45317

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