commit d281de75ad4c8c5ab0c5b3ac12de0c26e7ba8fbc
author Paul Crowley <paulcrowley@google.com> Thu Aug 30 15:25:19 2018 -0700
committer Paul Crowley <paulcrowley@google.com> Tue Feb 18 11:00:15 2020 -0800
tree 2538bc40f288ac628a88332cae79d2e988fca493
parent 8e0780cba28d974bd1dc3289a8eedbbfa6a8942b

Fix unaligned access to auth token user_id

Bug: 65232288
Test: Set a pattern on cuttlefish, ensure we can unlock
Change-Id: I5ee09cf72ab7d3d636a25755134bfad6f88265f9

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