commit bb7261421de892c50e570f6a97b56c39e69b628b
author Josh Gao <jmgao@google.com> Thu Jan 12 21:40:40 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 12 21:40:40 2017 +0000
tree afbe9d13dfa778eb80e9ae0a68b3547e628b0d01
parent c78efd7113e7274414f9feb3c05f52f06797c358
parent 5e0caf8d1baacc22c81ed7e35eb3871616202d04

Merge "adb: remove support for legacy f_adb interface." am: 72d4c42cd5 am: 6865111e9c
am: 5e0caf8d1b

Change-Id: I96885973331c920ad26b96e016b30f05e4318e78

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