Fix TpmIsReady regression.

tpm_init.cc

 // Copyright (c) 2009-2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Contains the implementation of class TpmInit
 
 #include "tpm_init.h"
 
 #include <base/logging.h>
 #include <base/platform_thread.h>
@@ skipping 65 matching lines @@
 bool TpmInit::StartInitializeTpm() {
   initialize_called_ = true;
   if (!PlatformThread::CreateNonJoinable(0, tpm_init_task_.get())) {
     LOG(ERROR) << "Unable to create TPM initialization background thread.";
     return false;
   }
   return true;
 }
 
 bool TpmInit::IsTpmReady() {
-  // The TPM is not "ready" if the init call has not completed.  It may be in
-  // the middle of taking ownership.
-  if (!task_done_) {
-    return false;
-  }
-  // If initialize_took_ownership_ is true, then the TPM went through a full
-  // succesful ownership cycle in InitializeTpm()
-  if (initialize_took_ownership_) {
-    return true;
-  }
-  // If we get here, then the call to InitializeTpm() is complete and it
-  // returned false.  That merely means that it did not successfully take
-  // ownership, which is the common case after ownership is established on OOBE.
-  // In that case, the TPM is ready if it is enabled and owned.
+  // The TPM is "ready" if it is enabled, owned, and not being owned.
   return (tpm_init_task_->get_tpm()->IsEnabled() &&
-          tpm_init_task_->get_tpm()->IsOwned());
+          tpm_init_task_->get_tpm()->IsOwned() &&
+          !tpm_init_task_->get_tpm()->IsBeingOwned());
 }
 
 bool TpmInit::IsTpmEnabled() {
   return tpm_init_task_->get_tpm()->IsEnabled();
 }
 
 bool TpmInit::IsTpmOwned() {
   return tpm_init_task_->get_tpm()->IsOwned();
 }
 
@@ skipping 27 matching lines @@
     LOG(ERROR) << "TPM initialization took " << initialization_time_ << "ms";
   }
   task_done_ = true;
   if (notify_callback_) {
     notify_callback_->InitializeTpmComplete(initialize_result,
                                             initialize_took_ownership_);
   }
 }
 
 }  // namespace tpm_init