commit 970ea1cf680579b9321a5dab8b51e36a67b2a41d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 19 22:20:32 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 19 22:20:32 2020 +0000
tree ca3e3a4c07bc924340c044ebbd5dc044cebdf355
parent c45705672c89c918ae88ce8127607d1d7cfa7de5
parent 7b9b1649466f1708008a6fee3fd4f44cb4cb6872

Merge "Fix unaligned access to auth token user_id" am: 21a17b091e am: 01759662fd am: 7b9b164946

Change-Id: Ibe10561445571d7607ea93d7a988a9ab847e234a

KeyStorage.cpp

diff --git a/KeyStorage.cpp b/KeyStorage.cpp
index a7582c2..951536b 100644
--- a/KeyStorage.cpp
+++ b/KeyStorage.cpp
@@ -122,7 +122,8 @@
             return false;
         }
         const hw_auth_token_t* at = reinterpret_cast<const hw_auth_token_t*>(auth.token.data());
-        paramBuilder.Authorization(km::TAG_USER_SECURE_ID, at->user_id);
+        auto user_id = at->user_id;  // Make a copy because at->user_id is unaligned.
+        paramBuilder.Authorization(km::TAG_USER_SECURE_ID, user_id);
         paramBuilder.Authorization(km::TAG_USER_AUTH_TYPE, km::HardwareAuthenticatorType::PASSWORD);
         paramBuilder.Authorization(km::TAG_AUTH_TIMEOUT, AUTH_TIMEOUT);
     }