commit 4b8769b12abb8d3b228160e1c0f839af5348d2e6
author Shawn Willden <swillden@google.com> Mon Oct 07 16:09:03 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 07 16:09:03 2019 -0700
tree bc2a830603fa5eac10b4442df27ecaa7f01e9b85
parent 90eed4674395fd5958f4364c65d9c1489d23f0d5
parent 6ba5d93f9ebfe7fac89baeb57ce7439c8f144202

[automerger skipped] Encrypt AES-256 keystore master keys. am: 58e675567c -s ours am: bf0ed8ba46
am: 6ba5d93f9e

Change-Id: Iad65cc33fb8f6a2dff469c7fb805aefdc55813c3

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(