From fa67c8fc1d2c50ea9d4e04492d06f992ea65d2b6 Mon Sep 17 00:00:00 2001
From: Shawn Willden <swillden@google.com>
Date: Mon, 24 Apr 2017 08:10:55 -0600
Subject: [PATCH] Fix Keymaster HAL crash.

Test: VTS test validates this fix
Change-Id: I5996c2166cf4141c97424df64a380f45b001d52e
---
 keymaster/3.0/default/KeymasterDevice.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keymaster/3.0/default/KeymasterDevice.cpp b/keymaster/3.0/default/KeymasterDevice.cpp
index 58102bba62..1c431bcb8a 100644
--- a/keymaster/3.0/default/KeymasterDevice.cpp
+++ b/keymaster/3.0/default/KeymasterDevice.cpp
@@ -547,6 +547,7 @@ Return<void> KeymasterDevice::attestKey(const hidl_vec<uint8_t>& keyToAttest,
     if (!foundAttestationApplicationId) {
         _hidl_cb(ErrorCode::ATTESTATION_APPLICATION_ID_MISSING,
                  resultCertChain);
+        return Void();
     }
 
     keymaster_cert_chain_t cert_chain{nullptr, 0};