commit 0d466c94a81eec5a701748ff7526a2e3515b3c97
author android-build-team Robot <android-build-team-robot@google.com> Sat Sep 21 23:27:11 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Sep 21 23:27:11 2019 +0000
tree 295c6cf6010185a210e2f857231c67eb1fdb9b9a
parent 51d7a88d8618c61bf35336f8215feebe7ae6be58
parent 83aa272cae58ad2be32b946f5d4011abefcb07e8

Snap for 5892339 from 83aa272cae58ad2be32b946f5d4011abefcb07e8 to qt-qpr1-release

Change-Id: I78d0c2ea3a4bbcb8e46c024120c6865d9392cc73

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(