commit 4db40953251c1775b4d92825efb62a4b0f3ad1da
author Elliott Hughes <enh@google.com> Tue Jan 10 01:33:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 10 01:33:37 2017 +0000
tree fe91cfaad95327310f0cceb928253b44bd4bcf59
parent 70d916bd7caa3553294f8ca821f820c7dcf4d4b7
parent 394184a63f360e767654fae41df59cd4afdc2687

Merge "Revert "Revert "android_ids: move to bionic""" am: b2375fc40c am: 5f57659030
am: 15f24e5df9

Change-Id: I718ecb5674a2ce85de4116ece310af404614e45c

gatekeeperd/gatekeeperd.cpp

diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp
index 4107f55..49a8841 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);