commit a3b1b744cc7ea2dcde4f920f0139dc68fc4671c6
author Matthew Maurer <mmaurer@google.com> Thu May 14 00:19:49 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 14 00:19:49 2020 +0000
tree 2ab22dc32be91c52412bd166a9359fa2904948d4
parent c54bf37cb83bf8da35ce495e73d2fd1690712dc0
parent ec9425eaccdc046685632ab61088c485cd5dd499

Fix size check for auth_token am: ec9425eacc

Change-Id: If65acca19b18cad4bf6f3c357c2ac4d64dce245c

android_keymaster/keymaster_enforcement.cpp

diff --git a/android_keymaster/keymaster_enforcement.cpp b/android_keymaster/keymaster_enforcement.cpp
index 2db7165..bfaaf08 100644
--- a/android_keymaster/keymaster_enforcement.cpp
+++ b/android_keymaster/keymaster_enforcement.cpp
@@ -458,7 +458,7 @@
         return false;
     }
 
-    if (auth_token_blob.data_length != sizeof(*auth_token)) {
+    if (auth_token_blob.data_length != sizeof(**auth_token)) {
         LOG_E("Bug: Auth token is the wrong size (%d expected, %d found)", sizeof(hw_auth_token_t),
               auth_token_blob.data_length);
         return false;