commit 4eea9764a445e460ab2491ca964a8c442158f476
author Janis Danisevskis <jdanis@google.com> Wed Jul 31 12:32:36 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jul 31 12:32:36 2019 -0700
tree 57bc1225d242dde0a6c61a8fb149b9f3b3a260f2
parent f955b4ac05b215148ef1a756495ef46ee3ccfcaf
parent 4e3f697233ba1936066f0ee83243fdefa259eef9

Merge "Fixed unchecked key blob access in attestKey"
am: 4e3f697233

Change-Id: If4a382525807b5d7663682f1a927b0d9c2607441

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index 5e7efab..e1b1a66 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1039,6 +1039,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(