Fix one-time init

firmware/lib/rollback_index.c

 /* Copyright (c) 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.
  *
  * Functions for querying, manipulating and locking rollback indices
  * stored in the TPM NVRAM.
  */
 
 #include "rollback_index.h"
 
@@ skipping 89 matching lines @@
 /* Performs one-time initializations.  Creates the NVRAM spaces, and sets their
  * initial values as needed.  Sets the nvLocked bit and ensures the physical
  * presence command is enabled and locked.
  */
 static uint32_t OneTimeInitializeTPM(RollbackSpaceFirmware* rsf,
                                      RollbackSpaceKernel* rsk) {
   static const RollbackSpaceFirmware rsf_init = {
     ROLLBACK_SPACE_FIRMWARE_VERSION, 0, 0, 0};
   static const RollbackSpaceKernel rsk_init = {
     ROLLBACK_SPACE_KERNEL_VERSION, ROLLBACK_SPACE_KERNEL_UID, 0, 0};
-  uint8_t nvlocked = 0;
+  TPM_PERMANENT_FLAGS pflags;
+  uint32_t result;
 
   VBDEBUG(("TPM: One-time initialization\n"));
 
-  RETURN_ON_FAILURE(TlclFinalizePhysicalPresence());
+  result = TlclGetPermanentFlags(&pflags);
+  if (result != TPM_SUCCESS)
+    return result;
+
+  /* TPM may come from the factory without physical presence finalized.  Fix
+   * if necessary. */
+  VBDEBUG(("TPM: physicalPresenceLifetimeLock=%d\n",
+           pflags.physicalPresenceLifetimeLock));
+  if (!pflags.physicalPresenceLifetimeLock) {
+    VBDEBUG(("TPM: Finalizing physical presence\n"));
+    RETURN_ON_FAILURE(TlclFinalizePhysicalPresence());
+  }
 
   /* The TPM will not enforce the NV authorization restrictions until the
    * execution of a TPM_NV_DefineSpace with the handle of TPM_NV_INDEX_LOCK.
    * Here we create that space if it doesn't already exist. */
-  RETURN_ON_FAILURE(TlclGetFlags(NULL, NULL, &nvlocked));
-  VBDEBUG(("TPM: nvlocked=%d\n", nvlocked));
-  if (!nvlocked) {
+  VBDEBUG(("TPM: nvLocked=%d\n", pflags.nvLocked));
+  if (!pflags.nvLocked) {
     VBDEBUG(("TPM: Enabling NV locking\n"));
     RETURN_ON_FAILURE(TlclSetNvLocked());
   }
 
+  /* Clear TPM owner, in case the TPM is already owned for some reason. */
+  VBDEBUG(("TPM: Clearing owner\n"));
+  RETURN_ON_FAILURE(TlclForceClear());
+
   /* Initializes the firmware and kernel spaces */
   Memcpy(rsf, &rsf_init, sizeof(RollbackSpaceFirmware));
   Memcpy(rsk, &rsk_init, sizeof(RollbackSpaceKernel));
 
   /* Defines and sets firmware and kernel spaces */
   RETURN_ON_FAILURE(SafeDefineSpace(FIRMWARE_NV_INDEX,
                                     TPM_NV_PER_GLOBALLOCK | TPM_NV_PER_PPWRITE,
                                     sizeof(RollbackSpaceFirmware)));
   RETURN_ON_FAILURE(WriteSpaceFirmware(rsf));
   RETURN_ON_FAILURE(SafeDefineSpace(KERNEL_NV_INDEX, TPM_NV_PER_PPWRITE,
@@ skipping 281 matching lines @@
 
 uint32_t RollbackKernelLock(void) {
   if (g_rollback_recovery_mode) {
     return TPM_SUCCESS;
   } else {
     return TlclLockPhysicalPresence();
   }
 }
 
 #endif // DISABLE_ROLLBACK_TPM