| commit | fa67c8fc1d2c50ea9d4e04492d06f992ea65d2b6 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Mon Apr 24 08:10:55 2017 -0600 |
| committer | Shawn Willden <swillden@google.com> | Mon Apr 24 08:11:07 2017 -0600 |
| tree | 16d9665db103f7a64a03586ffb26ac74eb0ac69a | |
| parent | 30f78a13b03449d879249897313e93723ff91d39 [diff] |
Fix Keymaster HAL crash. Test: VTS test validates this fix Change-Id: I5996c2166cf4141c97424df64a380f45b001d52e
diff --git a/keymaster/3.0/default/KeymasterDevice.cpp b/keymaster/3.0/default/KeymasterDevice.cpp index 58102bb..1c431bc 100644 --- a/keymaster/3.0/default/KeymasterDevice.cpp +++ b/keymaster/3.0/default/KeymasterDevice.cpp
@@ -547,6 +547,7 @@ if (!foundAttestationApplicationId) { _hidl_cb(ErrorCode::ATTESTATION_APPLICATION_ID_MISSING, resultCertChain); + return Void(); } keymaster_cert_chain_t cert_chain{nullptr, 0};