commit 2443c5e990c07a188222f9ef4bf57906f8ec7c48
author Tao Bao <tbao@google.com> Fri Jan 06 17:12:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 06 17:12:28 2017 +0000
tree a58b46824b9755d63c9157182fd75eabf2b0e66b
parent da100377b049b59d41ebfa4f7b6387486f474220
parent 2b5065648c5722d851ee601fe474a5678ea32fce

Merge "adb: Fix the 'adb reboot sideload' for A/B devices." am: 9f59a4663c am: b26579f326
am: 2b5065648c

Change-Id: Ic9fbeb1fc0d9e894d3f8d7fe04f773f501d5f669

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