From 4a0e999146cd5a668bf6125a6265208d43d4dc66 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Thu, 29 Jan 2015 17:50:58 -0800 Subject: [PATCH] vboot2: Fill vboot1 handoff with correct TPM firmware version sd->fw_version represents the version of the *current* firmware, which is not necessarily the same as the one stored in the TPM (and may be 0 in recovery mode). Use the newly added sd->fw_version_secdata instead which contains a more correct value. CQ-DEPEND=CL:245531 BRANCH=veyron BUG=chrome-os-partner:35941 TEST=Booted Jerry in recovery mode, confirmed crossystem tpm_fwver was corrent (and not 0). Change-Id: Id95bd8c6412f2e8b2ae643c3b5a3dee13d0d47be Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/244591 Reviewed-by: Randall Spangler (cherry picked from commit eb8142f69cea34e11f9081caafcaae7a15cc3801) Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/245495 --- src/vendorcode/google/chromeos/vboot2/vboot_handoff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c b/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c index 66a659622d..a5c7de617c 100644 --- a/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c +++ b/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c @@ -83,7 +83,7 @@ static void fill_vboot_handoff(struct vboot_handoff *vboot_handoff, vb_sd->struct_size = sizeof(VbSharedDataHeader); vb_sd->data_size = VB_SHARED_DATA_MIN_SIZE; vb_sd->data_used = sizeof(VbSharedDataHeader); - vb_sd->fw_version_tpm = vb2_sd->fw_version; + vb_sd->fw_version_tpm = vb2_sd->fw_version_secdata; if (get_write_protect_state()) vb_sd->flags |= VBSD_BOOT_FIRMWARE_WP_ENABLED;