commit 6767ddbc915c909822d2ba37bf93c84c753162b8
author Andre Eisenbach <eisenbach@google.com> Wed Jan 11 03:07:48 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 11 03:07:48 2017 +0000
tree aed68e34c5f92d7b5803913f8abe0470de3a2be9
parent d3e3d3bce93e4517190ab09d24246fb0191e1def
parent 1e584246119fa2f05ca27b95c1e807a557d68806

Merge "Allow Bluetooth HAL to access /sys/class/rfkill" am: 6ad690dfd4 am: a398921635
am: d969153aad

Change-Id: I2ca2589854e07ff5b77352e6c2cebcb67fa3eee6

gatekeeperd/gatekeeperd.cpp

diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp
index 4107f55..49a8841 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);