summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChad Brubaker <cbrubaker@google.com>2015-08-12 23:38:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-12 23:38:33 +0000
commit48d998cd4982554f9b66b029331dab17154299cc (patch)
tree318d7953f55e5d295d8b37ca87d92216261b221c
parent63bc525c24efc3a1f6386a4e0e395a4c70a335ca (diff)
parentaca711395dd65d05b48c8bec3b1d2da8d81d41b8 (diff)
downloadandroid_system_security-48d998cd4982554f9b66b029331dab17154299cc.tar.gz
android_system_security-48d998cd4982554f9b66b029331dab17154299cc.tar.bz2
android_system_security-48d998cd4982554f9b66b029331dab17154299cc.zip
am aca71139: am 738d1e9d: am 1b8885ba: am 0d593526: Properly check for Blob max length
* commit 'aca711395dd65d05b48c8bec3b1d2da8d81d41b8': Properly check for Blob max length
-rw-r--r--keystore/keystore.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index a956533..c1ce584 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -487,12 +487,12 @@ class Blob {
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;