diff options
| author | Stephen Hines <srhines@google.com> | 2016-12-14 03:21:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-14 03:21:24 +0000 |
| commit | ce3fcb76816e2225d6a9528f3fcd5ba69cacb9cf (patch) | |
| tree | 45f130915a5cf9f11d2b04c28ad2d1d6df852b81 /gatekeeperd | |
| parent | 2f4ae4a93e2583704754463ca2140e4b822fe48b (diff) | |
| parent | 231c73504334f2636bcd99cb172408231c381815 (diff) | |
| download | core-ce3fcb76816e2225d6a9528f3fcd5ba69cacb9cf.tar.gz core-ce3fcb76816e2225d6a9528f3fcd5ba69cacb9cf.tar.bz2 core-ce3fcb76816e2225d6a9528f3fcd5ba69cacb9cf.zip | |
Merge "Switch to memcpy for accessing misaligned data." am: 2bdb37190c am: 87daae5505 am: 317f152365
am: 231c735043
Change-Id: I893ed58f9667744ec54510020ca18743ab10fa71
Diffstat (limited to 'gatekeeperd')
| -rw-r--r-- | gatekeeperd/SoftGateKeeper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gatekeeperd/SoftGateKeeper.h b/gatekeeperd/SoftGateKeeper.h index 8b15d72e2..cb02a6fc6 100644 --- a/gatekeeperd/SoftGateKeeper.h +++ b/gatekeeperd/SoftGateKeeper.h @@ -152,7 +152,7 @@ public: } bool DoVerify(const password_handle_t *expected_handle, const SizedBuffer &password) { - uint64_t user_id = android::base::get_unaligned(&expected_handle->user_id); + uint64_t user_id = android::base::get_unaligned<secure_id_t>(&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; |