commit 5c5534e7623e394fc5ea875656c9ee63a519d47a
author Yi Chou <yich@google.com> Wed Dec 09 15:45:15 2020 +0800
committer Commit Bot <commit-bot@chromium.org> Tue Dec 15 15:19:16 2020 +0000
tree 21bc5c849ed08eeb44c06b585e0b73d02406f2a0
parent 7126846a12fcd0c69e9cf3f53eff95da7fef9081

trunks: return error when tpm_state failed to initialize

This would fix this error:
Value stored to 'result' is never read

BUG=b:174652437
TEST=CQ

Change-Id: Ia7b3757782d19a1dec81d1a6b59c216e1b01a442
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2580966
Tested-by: Yi Chou <yich@google.com>
Reviewed-by: Leo Lai <cylai@google.com>
Reviewed-by: Andrey Pronin <apronin@chromium.org>
Commit-Queue: Yi Chou <yich@google.com>

trunks/tpm_utility_impl.cc

diff --git a/trunks/tpm_utility_impl.cc b/trunks/tpm_utility_impl.cc
index 5b94ab3..9f9677b 100644
--- a/trunks/tpm_utility_impl.cc
+++ b/trunks/tpm_utility_impl.cc
@@ -369,6 +369,9 @@
   }
   std::unique_ptr<TpmState> tpm_state(factory_.GetTpmState());
   result = tpm_state->Initialize();
+  if (result != TPM_RC_SUCCESS) {
+    return result;
+  }
 
   session->SetEntityAuthorizationValue("");
   if (!tpm_state->IsEndorsementPasswordSet()) {