From a2a1421dd525e13afca476fae55d1b6921ab31da Mon Sep 17 00:00:00 2001 From: Shawn Willden Date: Tue, 7 Jun 2022 13:09:47 -0600 Subject: Add error logging in GetRootOfTrust Bug: 219076736 Test: VtsAidlKeyMintTargetTest Ignore-AOSP-First: Cherry pick from AOSP Change-Id: I9670bc63fb7d9e2c2091357f16bea27e8e3331bf (cherry picked from commit 63bf7285d48413c10b5833d2c9b4438b78c29a4d) --- android_keymaster/android_keymaster.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/android_keymaster/android_keymaster.cpp b/android_keymaster/android_keymaster.cpp index 828dead..420bbf2 100644 --- a/android_keymaster/android_keymaster.cpp +++ b/android_keymaster/android_keymaster.cpp @@ -942,21 +942,27 @@ GetRootOfTrustResponse AndroidKeymaster::GetRootOfTrust(const GetRootOfTrustRequ GetRootOfTrustResponse response(message_version()); if (!context_->attestation_context()) { + LOG_E("Have no attestation context, cannot get RootOfTrust", 0); response.error = KM_ERROR_UNIMPLEMENTED; return response; } const AttestationContext::VerifiedBootParams* vbParams = context_->attestation_context()->GetVerifiedBootParams(&response.error); - if (response.error != KM_ERROR_OK) return response; + if (response.error != KM_ERROR_OK) { + LOG_E("Error retrieving verified boot params: %lu", response.error); + return response; + } auto boot_patch_level = context_->GetBootPatchlevel(); if (!boot_patch_level) { + LOG_E("Error retrieving boot patch level: %lu", response.error); response.error = KM_ERROR_UNIMPLEMENTED; return response; } if (!context_->enforcement_policy()) { + LOG_E("Have no enforcement policy, cannot get RootOfTrust", 0); response.error = KM_ERROR_UNIMPLEMENTED; return response; } -- cgit v1.2.3