commit a1d9bfa4f806f887d7dbd21718a26c1650144c1a
author Mark Salyzyn <salyzyn@google.com> Thu Jan 12 23:54:38 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 12 23:54:38 2017 +0000
tree 35316108c0f8de09095efa8cec505af07c6f8b26
parent b9287f5a583d59fa2c64b82e1fbe717ce1ae1ce4
parent c4dba4032a85232bcf52224bc58bf830a469f5dd

Merge "liblog: use log/log.h for ALOG macros" am: dd9fa24091 am: 112d1dcd95
am: 33807cd6c2

Change-Id: I341970b6ddb6610418d85a378ef2984861858c65

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