commit ed4f566a926d935ee7e2a158d75bbd050ef85778
author Chad Brubaker <cbrubaker@google.com> Wed Jan 14 19:22:09 2015 -0800
committer Chad Brubaker <cbrubaker@google.com> Wed Jan 14 19:22:09 2015 -0800
tree 5d8afabab647abe8a7d84dcb65cdcac93b327c90
parent c7c4d777f08ecbd0d6d3fea334e7f652e548da2e
parent 4e6d3b7f4124ebfe5e92993c4445c134661a0106

resolved conflicts for merge of 4e6d3b7f to master

Change-Id: I35dfcc7918b1f343d214979bf27a78cbd86972e2

keystore/IKeystoreService.cpp

diff --git a/keystore/IKeystoreService.cpp b/keystore/IKeystoreService.cpp
index 53788bd..2ab4ac4 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) {
 }
@@ -772,6 +774,9 @@
             int32_t argsPresent = data.readInt32();
             if (argsPresent == 1) {
                 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();