commit 3cf8532cc296cabbe41589c29c324292c88bd556
author Janis Danisevskis <jdanis@google.com> Mon Nov 19 13:37:49 2018 -0800
committer Janis Danisevskis <jdanis@google.com> Tue Nov 20 13:38:43 2018 -0800
tree 66e62cd1221ed9947515c5ce01eb9bd1eeb7d907
parent 265435f7776b3a1f16b292c69fe06859f50502cb

Fixed nullptr deref when exporting a non existing key

Bug: 119771891
Test: keystore_cli_v2 export --name=missing-key
Change-Id: I096b7c98d3522234e9393876766a9e9a84cf9529

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index fa010e6..35530e1 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -818,7 +818,7 @@
 
     std::tie(rc, keyBlob, charBlob, lockedEntry) =
         mKeyStore->getKeyForName(name8, targetUid, TYPE_KEYMASTER_10);
-    if (!rc) {
+    if (!rc.isOk()) {
         return AIDL_RETURN(rc);
     }