commit 4e3f697233ba1936066f0ee83243fdefa259eef9
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 31 18:54:32 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 31 18:54:32 2019 +0000
tree 034e78124c113437a583c3954aeb3ab875a64efe
parent 9f22467a12ea78a164570029a5aecd886f892a04
parent 9dff56c52bcb39781fec1afffc55f5091e2ad799

Merge "Fixed unchecked key blob access in attestKey"

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index 1319b23..a9c3687 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1057,6 +1057,10 @@
     std::tie(rc, keyBlob, charBlob, lockedEntry) =
         mKeyStore->getKeyForName(name8, callingUid, TYPE_KEYMASTER_10);
 
+    if (!rc.isOk()) {
+        return AIDL_RETURN(rc);
+    }
+
     auto dev = mKeyStore->getDevice(keyBlob);
     auto hidlKey = blob2hidlVec(keyBlob);
     dev->attestKey(