am a4af2b61: am 6ab2fc83: Merge "system/security: sync with latest BoringSSL."
* commit 'a4af2b61bb1cc308c6c7f03fb31d266399c7847d':
system/security: sync with latest BoringSSL.
diff --git a/keystore/IKeystoreService.cpp b/keystore/IKeystoreService.cpp
index 40fbe0e..ca97650 100644
--- a/keystore/IKeystoreService.cpp
+++ b/keystore/IKeystoreService.cpp
@@ -29,6 +29,8 @@
namespace android {
+const ssize_t MAX_GENERATE_ARGS = 3;
+
KeystoreArg::KeystoreArg(const void* data, size_t len)
: mData(data), mSize(len) {
}
@@ -769,6 +771,9 @@
int32_t flags = data.readInt32();
Vector<sp<KeystoreArg> > args;
ssize_t numArgs = data.readInt32();
+ if (numArgs > MAX_GENERATE_ARGS) {
+ return BAD_VALUE;
+ }
if (numArgs > 0) {
for (size_t i = 0; i < (size_t) numArgs; i++) {
ssize_t inSize = data.readInt32();