Merge "Fix unaligned access to auth token user_id" am: 21a17b091e

Change-Id: If1b44823f6758c9428b5874b2629579f384399b7
4 years ago · 01759662fd
parent b6421644ec 21a17b091e
commit 01759662fd
1 changed files with 2 additions and 1 deletions
--- a/KeyStorage.cpp
+++ b/KeyStorage.cpp
@ -122,7 +122,8 @@ static bool generateKeymasterKey(Keymaster& keymaster, const KeyAuthentication&
            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);
    }