commit fe88cbd5b3add033ac8000b364771a9cba8f8d49
author Elliott Hughes <enh@google.com> Mon Jan 16 18:27:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 16 18:27:32 2017 +0000
tree 57dcdecd2f6e4af2d4acf7386705abc916f81c8b
parent 1772bd3a85d868dbb9be85895ad046e32b21e52b
parent 18dda3702fbe7e5979ab78ea56695db0741a513f

Merge "Remove fs_mgr's bogus external/openssl/include LOCAL_C_INCLUDES entry." am: c160675a93 am: ed67c75206
am: 1b4ef805b1

Change-Id: I305cf0b3df95433d387f306daac774fa13d0854f

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