commit 7ec2cc505a1f32336ce8e8a5da29776e467681f2
author Chad Brubaker <cbrubaker@google.com> Wed Aug 12 21:49:30 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 12 21:49:30 2015 +0000
tree 37eb3a6c4d49225870227cac3b77c4b1a4dcd419
parent db25fcde6b0008083ebcc56ca58c30b396d19325
parent a8f5bbbee318cf3dc0272a80a59eb6c0d537c692

am a8f5bbbe: am 54b1e9ad: Properly check for Blob max length

* commit 'a8f5bbbee318cf3dc0272a80a59eb6c0d537c692':
  Properly check for Blob max length

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index 8a43f02..65a8ea9 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -508,12 +508,12 @@
     Blob(const uint8_t* value, size_t valueLength, const uint8_t* info, uint8_t infoLength,
             BlobType type) {
         memset(&mBlob, 0, sizeof(mBlob));
-        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;