ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "gatekeeperd: protect from invalid data passed by HAL" into nyc-mr2-dev

Browse source
This commit is contained in:
Alexey Polyudov 2017-01-04 03:28:42 +00:00 • committed by Android (Google) Code Review
commit d286af0bef
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gatekeeperd/gatekeeperd.cpp
View file

@ -169,7 +169,14 @@ public:
enrolled_password_handle, enrolled_password_handle_length); 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 = gatekeeper::password_handle_t *handle =
reinterpret_cast<gatekeeper::password_handle_t *>(*enrolled_password_handle); reinterpret_cast<gatekeeper::password_handle_t *>(*enrolled_password_handle);
store_sid(uid, handle->user_id); store_sid(uid, handle->user_id);