tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[gatekeeperd] fix other unaligned mem access

Browse source 
Initially tested with the wrong (mnc) toolchain
which just hid the error entirely. Now tested with
master toolchain so this should be the last instance.

Bug: 22367550
Change-Id: I0e785918b1a9f4a8af80dc96b794737fcfd12367
This commit is contained in:
Andres Morales 2015-07-10 13:54:22 -07:00
parent 6cd33beb8f
commit 17aa7571f9
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gatekeeperd/SoftGateKeeper.h
View file

@ -152,15 +152,15 @@ public:
}
bool DoVerify(const password_handle_t *expected_handle, const SizedBuffer &password) {
FastHashMap::const_iterator it = fast_hash_map_.find(
android::base::get_unaligned(&expected_handle->user_id));
uint64_t user_id = android::base::get_unaligned(&expected_handle->user_id);
FastHashMap::const_iterator it = fast_hash_map_.find(user_id);
if (it != fast_hash_map_.end() && VerifyFast(it->second, password)) {
return true;
} else {
if (GateKeeper::DoVerify(expected_handle, password)) {
uint64_t salt;
GetRandom(&salt, sizeof(salt));
fast_hash_map_[expected_handle->user_id] = ComputeFastHash(password, salt);
fast_hash_map_[user_id] = ComputeFastHash(password, salt);
return true;
}
}