commit 70d916bd7caa3553294f8ca821f820c7dcf4d4b7
author Mark Salyzyn <salyzyn@google.com> Mon Jan 09 17:27:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 09 17:27:21 2017 +0000
tree ef56453fea5d3da53633c971c64265dea06e1648
parent b65137ba4d943919d08bff1be86ba445a5d66e26
parent 5ac88436b1f58e46124b0a4b626cbb6fcfc866d4

Merge "liblog: retry -ENOTCONN | -ECONNREFUSED | -ENOENT indefinitely" am: d5583867c6 am: 295f3ba442
am: 4935c99659

Change-Id: I43501d70194c5300b7ff347a1fb884278edeaf31

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