commit 90eed4674395fd5958f4364c65d9c1489d23f0d5
author Shawn Willden <swillden@google.com> Mon Oct 07 15:29:35 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 07 15:29:35 2019 -0700
tree bc2a830603fa5eac10b4442df27ecaa7f01e9b85
parent 921d3a3678408af3598ef6bd8ec8f8afd4f6ee2e
parent 1bf93470ed164c324228c9fbdb2559a6940dcc8a

Encrypt AES-256 keystore master keys. am: b951bc5317
am: 1bf93470ed

Change-Id: Iee2e907795de09dfd49312ecc845a6a107a996a1

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(