diff options
| author | Randall Spangler <rspangler@chromium.org> | 2011-04-17 10:48:10 -0700 |
|---|---|---|
| committer | Randall Spangler <rspangler@chromium.org> | 2011-04-17 10:48:10 -0700 |
| commit | 700fc49a7e38531745f1afd7d7fb714e51ec92d4 (patch) | |
| tree | b1360ea5f129d905a4a01309b697037cac85c8c4 | |
| parent | 83728d0aef71945e54b8948107361b86a95118d9 (diff) | |
| download | vboot-700fc49a7e38531745f1afd7d7fb714e51ec92d4.tar.gz | |
Do not advance kernel version in TPM if we are in firmware B trying a new firmware
Change-Id: If5b6390d011d743689cf96e49202358397663651
R=bleung@chromium.org,dlaurie@chromium.org,sumit@chromium.org
BUG=chrome-os-partner:3367
TEST=make && make runtests
Review URL: http://codereview.chromium.org/6871044
| -rw-r--r-- | firmware/lib/vboot_kernel.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/firmware/lib/vboot_kernel.c b/firmware/lib/vboot_kernel.c index cfdd9b4c..0e9c15ba 100644 --- a/firmware/lib/vboot_kernel.c +++ b/firmware/lib/vboot_kernel.c @@ -597,13 +597,12 @@ int LoadKernel(LoadKernelParams* params) { shcall->check_result = VBSD_LKC_CHECK_GOOD_PARTITION; /* See if we need to update the TPM */ - if (kBootRecovery != boot_mode && good_partition_key_block_valid) { - /* We only update the TPM in normal and developer boot modes. In - * developer mode, we only advanced lowest_version for kernels with valid - * key blocks, and didn't count self-signed key blocks. In recovery - * mode, the TPM stays PP-unlocked, so anything we write gets blown away - * by the firmware when we go back to normal mode. */ - VBDEBUG(("Boot_flags = not recovery\n")); + if ((kBootNormal == boot_mode) && + !((1 == shared->firmware_index) && (shared->flags & VBSD_FWB_TRIED))) { + /* We only update the TPM in normal mode. We don't advance the + * TPM if we're trying a new firmware B, because that firmware + * may have a key change and roll forward the TPM too soon. */ + VBDEBUG(("Checking if TPM kernel version needs advancing\n")); if ((lowest_version > tpm_version) && (lowest_version != LOWEST_TPM_VERSION)) { |