commit 2ae291da2fd0c4f438621410d0ee1e520e562c21
author Chad Brubaker <cbrubaker@google.com> Fri Feb 20 22:41:17 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 20 22:41:17 2015 +0000
tree 55deb549ad557fff7104b4b9f6adecb801a3f9d6
parent cc0900cd68ec033a7d45e43feabf50aadeae4f3d
parent e732de519d001335310ae4ba32095130850e97a7

am e732de51: am 789e3c25: Merge "Fix incorrect keymaster device usage."

* commit 'e732de519d001335310ae4ba32095130850e97a7':
  Fix incorrect keymaster device usage.

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