commit d97e3fd9f343439ba8bb1403c9cda77a5e2704bb
author bowgotsai <bowgotsai@google.com> Fri Jan 13 06:33:50 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 13 06:33:50 2017 +0000
tree 49aa71afe342deaa464c50571b30109c1c1d8cb6
parent a1d9bfa4f806f887d7dbd21718a26c1650144c1a
parent b439da115343e8cd1d0e4b4222395f4364a196d8

Merge "fs_mgr: moves common functions out of fs_mgr_verity.cpp" am: a37ff0dd83 am: ca11618b25
am: bfe74a7ac3

Change-Id: I148a63c8928db1b198472226b598d981203aab47

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