commit 60e97e7adb968f9f31a7ad69aa338ad3a197b920
author bowgotsai <bowgotsai@google.com> Fri Jan 13 18:21:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 13 18:21:32 2017 +0000
tree 92188b9dda2954fad1fece15af04a8524b479ccd
parent 93b0a6f7fc357a826c1c92b2bf0a0f1eaedbb7d1
parent 0de5270c00b71ff6244c5951dd6bbba88f2d71e2

Merge "fs_mgr: use std::string for function parameters in fs_mgr_dm_ioctl.cpp" am: 8c301d22e4 am: 538cef7b48
am: e7914cbf59

Change-Id: Ibad5cf498cda4daa8cdd6b0a81a05cda71782f10

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