commit cc0900cd68ec033a7d45e43feabf50aadeae4f3d
author Chad Brubaker <cbrubaker@google.com> Thu Feb 12 20:01:50 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 12 20:01:50 2015 +0000
tree fbd45afb68a5d3eec91b1f934659a11fdc79c53a
parent d512992c4fefac2922f1181e29318780be46ad7f
parent b892638044abf975e7b7e8bbbd25f5ac2d760f40

am b8926380: am c3d14005: Merge "Use a keystore_device for fallback to softkeymaster"

* commit 'b892638044abf975e7b7e8bbbd25f5ac2d760f40':
  Use a keystore_device for fallback to softkeymaster

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();