commit d4916a0a6a41c45397b7ffa8c698cb6553693b13
author Chad Brubaker <cbrubaker@google.com> Wed Aug 12 13:40:31 2015 -0700
committer The Android Automerger <android-build@android.com> Tue Sep 01 14:22:20 2015 -0700
tree cb07329d4656242cdacef40862128275d9dfb7b4
parent bb9f4392c2f1b11be3acdc1737828274ff1ec55b

Properly check for Blob max length

sizeof(mBlob.value) is incorrect because writeBlob pads up to the next
AES_BLOCK_SIZE

Bug:22802399
Change-Id: I377edca2c7ea2cf4455f22f5f927fdad79893729

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index 58d2fd6..4fdd593 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -487,12 +487,12 @@
 public:
     Blob(const uint8_t* value, size_t valueLength, const uint8_t* info, uint8_t infoLength,
             BlobType type) {
-        if (valueLength > sizeof(mBlob.value)) {
-            valueLength = sizeof(mBlob.value);
+        if (valueLength > VALUE_SIZE) {
+            valueLength = VALUE_SIZE;
             ALOGW("Provided blob length too large");
         }
-        if (infoLength + valueLength > sizeof(mBlob.value)) {
-            infoLength = sizeof(mBlob.value) - valueLength;
+        if (infoLength + valueLength > VALUE_SIZE) {
+            infoLength = VALUE_SIZE - valueLength;
             ALOGW("Provided info length too large");
         }
         mBlob.length = valueLength;