commit 823909c2505eb112780eb28afefe32fb3f56f29a
author Dan Albert <danalbert@google.com> Fri Jan 06 21:12:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 06 21:12:32 2017 +0000
tree 491046a806069bcbab8b0db627165e7e13c830cf
parent 39c390a3d31de1f2c6cac8d706eaceedbff01b81
parent bb3cb0186b17c1d5d98be02b96553b7660323fbe

Merge "Unversion NDK stub libraries." am: 879fc83ad1 am: 5e650e53ff
am: 579b873088

Change-Id: I0e02f8c677182d04caeb9d44838e5c2dc252ad4d

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