commit 1ad01dc776395c1c8f10a6961f8518900f47c15a
author Elliott Hughes <enh@google.com> Fri Jan 13 21:30:46 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 13 21:30:46 2017 +0000
tree e4c0837d7de43d41fa87f8ba601ae9bac756bdda
parent 477e6096e5af10d7c94971fd68c367ed91cdfe41
parent 08d9a9fe94f4b094a8bcc68c4dd1c69b27028b04

Merge "Fix libbase file.Readlink test on marlin/sailfish." am: 3052d123a8 am: e8250c0702
am: d8085aede5

Change-Id: I22b5041e89362267d32d57ed55cd245d0b67684d

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