[coreboot-gerrit] Patch set updated for coreboot: vboot: Add support for recovery hash space in TPM
Furquan Shaikh (furquan@google.com)
gerrit at coreboot.org
Wed Nov 9 17:33:09 CET 2016
Furquan Shaikh (furquan at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17273
-gerrit
commit 596509bd8c0ab91859c249d48a372b867fcef26e
Author: Furquan Shaikh <furquan at chromium.org>
Date: Mon Nov 7 23:54:42 2016 -0800
vboot: Add support for recovery hash space in TPM
1. Add a new index for recovery hash space in TPM - 0x100b
2. Add helper functions to read/write/lock recovery hash space in TPM
3. Add Kconfig option that can be selected by mainboards that want to
define this space.
4. Lock this new space while jumping from RO to RW.
BUG=chrome-os-partner:59355
BRANCH=None
TEST=Verified use of recovery hash space on reef.
Change-Id: I1cacd54f0a896d0f2af32d4b7c9ae581a918f9bb
Signed-off-by: Furquan Shaikh <furquan at chromium.org>
---
src/include/antirollback.h | 9 +++++
src/vboot/Kconfig | 8 ++++
src/vboot/secdata_mock.c | 5 +++
src/vboot/secdata_tpm.c | 96 +++++++++++++++++++++++++++++++++++++++++++++-
src/vboot/vboot_logic.c | 9 +++++
5 files changed, 126 insertions(+), 1 deletion(-)
diff --git a/src/include/antirollback.h b/src/include/antirollback.h
index b8ba909..a48aa20 100644
--- a/src/include/antirollback.h
+++ b/src/include/antirollback.h
@@ -21,6 +21,8 @@ enum vb2_pcr_digest;
* want to use 0x1009 for something else. */
#define BACKUP_NV_INDEX 0x1009
#define FWMP_NV_INDEX 0x100a
+#define REC_HASH_NV_INDEX 0x100b
+#define REC_HASH_NV_SIZE VB2_SHA256_DIGEST_SIZE
/* Structure definitions for TPM spaces */
@@ -46,6 +48,13 @@ uint32_t antirollback_write_space_firmware(struct vb2_context *ctx);
*/
uint32_t antirollback_lock_space_firmware(void);
+/* Read recovery hash data from TPM. */
+uint32_t antirollback_read_space_rec_hash(uint8_t *data, uint32_t size);
+/* Write new hash data to recovery space in TPM. */
+uint32_t antirollback_write_space_rec_hash(const uint8_t *data, uint32_t size);
+/* Lock down recovery hash space in TPM. */
+uint32_t antirollback_lock_space_rec_hash(void);
+
/****************************************************************************/
/*
diff --git a/src/vboot/Kconfig b/src/vboot/Kconfig
index f3df7c5..b5c8626 100644
--- a/src/vboot/Kconfig
+++ b/src/vboot/Kconfig
@@ -134,6 +134,14 @@ config VBOOT_OPROM_MATTERS
it works functionally the same for other platforms that can skip their
native display initialization code instead.
+config VBOOT_HAS_REC_HASH_SPACE
+ bool
+ default n
+ depends on VBOOT
+ help
+ Set this option to indicate to vboot that recovery data hash space
+ is present in TPM.
+
config VBOOT
bool "Verify firmware with vboot."
default n
diff --git a/src/vboot/secdata_mock.c b/src/vboot/secdata_mock.c
index 03616c1..9c966d9 100644
--- a/src/vboot/secdata_mock.c
+++ b/src/vboot/secdata_mock.c
@@ -36,3 +36,8 @@ uint32_t antirollback_lock_space_firmware()
{
return TPM_SUCCESS;
}
+
+uint32_t antirollback_lock_space_rec_hash(void)
+{
+ return TPM_SUCCESS;
+}
diff --git a/src/vboot/secdata_tpm.c b/src/vboot/secdata_tpm.c
index b1f3197..b177bd9 100644
--- a/src/vboot/secdata_tpm.c
+++ b/src/vboot/secdata_tpm.c
@@ -72,6 +72,13 @@ static uint32_t read_space_firmware(struct vb2_context *ctx)
return TPM_E_CORRUPTED_STATE;
}
+static uint32_t read_space_rec_hash(uint8_t *data)
+{
+ RETURN_ON_FAILURE(tlcl_read(REC_HASH_NV_INDEX, data,
+ REC_HASH_NV_SIZE));
+ return TPM_SUCCESS;
+}
+
static uint32_t write_secdata(uint32_t index,
const uint8_t *secdata,
uint32_t len)
@@ -117,6 +124,8 @@ static const uint8_t secdata_kernel[] = {
0xE8,
};
+static const uint8_t rec_hash_data[REC_HASH_NV_SIZE] = { };
+
#if IS_ENABLED(CONFIG_TPM2)
/* Nothing special in the TPM2 path yet. */
@@ -143,11 +152,23 @@ static uint32_t set_kernel_space(const void *kernel_blob)
return TPM_SUCCESS;
}
+static uint32_t set_rec_hash_space(const uint8_t *data)
+{
+ if (!IS_ENABLED(CONFIG_VBOOT_HAS_REC_HASH_SPACE))
+ return TPM_SUCCESS;
+ RETURN_ON_FAILURE(tlcl_define_space(REC_HASH_NV_INDEX,
+ REC_HASH_NV_SIZE));
+ RETURN_ON_FAILURE(safe_write(REC_HASH_NV_INDEX, data,
+ REC_HASH_NV_SIZE));
+ return TPM_SUCCESS;
+}
+
static uint32_t _factory_initialize_tpm(struct vb2_context *ctx)
{
RETURN_ON_FAILURE(tlcl_force_clear());
RETURN_ON_FAILURE(set_firmware_space(ctx->secdata));
RETURN_ON_FAILURE(set_kernel_space(secdata_kernel));
+ RETURN_ON_FAILURE(set_rec_hash_space(rec_hash_data));
return TPM_SUCCESS;
}
@@ -163,6 +184,14 @@ uint32_t antirollback_lock_space_firmware(void)
return tlcl_lock_nv_write(FIRMWARE_NV_INDEX);
}
+uint32_t antirollback_lock_space_rec_hash(void)
+{
+ if (!IS_ENABLED(CONFIG_VBOOT_HAS_REC_HASH_SPACE))
+ return TPM_SUCCESS;
+
+ return tlcl_lock_nv_write(REC_HASH_NV_INDEX);
+}
+
#else
uint32_t tpm_clear_and_reenable(void)
@@ -210,6 +239,21 @@ static uint32_t safe_define_space(uint32_t index, uint32_t perm, uint32_t size)
}
}
+static uint32_t set_rec_hash_space(const uint8_t *data)
+{
+ if (!IS_ENABLED(CONFIG_VBOOT_HAS_REC_HASH_SPACE))
+ return TPM_SUCCESS;
+
+ RETURN_ON_FAILURE(safe_define_space(REC_HASH_NV_INDEX,
+ TPM_NV_PER_GLOBALLOCK |
+ TPM_NV_PER_PPWRITE,
+ REC_HASH_NV_SIZE));
+ RETURN_ON_FAILURE(write_secdata(REC_HASH_NV_INDEX, data,
+ REC_HASH_NV_SIZE));
+
+ return TPM_SUCCESS;
+}
+
static uint32_t _factory_initialize_tpm(struct vb2_context *ctx)
{
TPM_PERMANENT_FLAGS pflags;
@@ -262,13 +306,24 @@ static uint32_t _factory_initialize_tpm(struct vb2_context *ctx)
RETURN_ON_FAILURE(write_secdata(FIRMWARE_NV_INDEX,
ctx->secdata,
VB2_SECDATA_SIZE));
- return TPM_SUCCESS;
+
+ /* Define and set rec hash space */
+ return set_rec_hash_space(rec_hash_data);
}
uint32_t antirollback_lock_space_firmware(void)
{
return tlcl_set_global_lock();
}
+
+uint32_t antirollback_lock_space_rec_hash(void)
+{
+ /*
+ * Nothing needs to be done here, since global lock is already set while
+ * locking firmware space.
+ */
+ return TPM_SUCCESS;
+}
#endif
uint32_t factory_initialize_tpm(struct vb2_context *ctx)
@@ -430,3 +485,42 @@ uint32_t antirollback_write_space_firmware(struct vb2_context *ctx)
{
return write_secdata(FIRMWARE_NV_INDEX, ctx->secdata, VB2_SECDATA_SIZE);
}
+
+uint32_t antirollback_read_space_rec_hash(uint8_t *data, uint32_t size)
+{
+ if (size != REC_HASH_NV_SIZE) {
+ VBDEBUG("TPM: Incorrect buffer size for rec hash. "
+ "(Expected=0x%x Actual=0x%x).\n", REC_HASH_NV_SIZE,
+ size);
+ return TPM_E_READ_FAILURE;
+ }
+ return read_space_rec_hash(data);
+}
+
+uint32_t antirollback_write_space_rec_hash(const uint8_t *data, uint32_t size)
+{
+ uint8_t spc_data[REC_HASH_NV_SIZE];
+ uint32_t rv;
+
+ if (size != REC_HASH_NV_SIZE) {
+ VBDEBUG("TPM: Incorrect buffer size for rec hash. "
+ "(Expected=0x%x Actual=0x%x).\n", REC_HASH_NV_SIZE,
+ size);
+ return TPM_E_WRITE_FAILURE;
+ }
+
+ rv = read_space_rec_hash(spc_data);
+ if (rv == TPM_E_BADINDEX) {
+ /*
+ * If space is not defined already for recovery hash, define
+ * new space.
+ */
+ VBDEBUG("TPM: Initializing recovery hash space.\n");
+ return set_rec_hash_space(data);
+ }
+
+ if (rv != TPM_SUCCESS)
+ return rv;
+
+ return write_secdata(REC_HASH_NV_INDEX, data, size);
+}
diff --git a/src/vboot/vboot_logic.c b/src/vboot/vboot_logic.c
index 57d83a0..1f0cbe7 100644
--- a/src/vboot/vboot_logic.c
+++ b/src/vboot/vboot_logic.c
@@ -416,6 +416,15 @@ void verstage_main(void)
vboot_reboot();
}
+ /* Lock rec hash space if available. */
+ rv = antirollback_lock_space_rec_hash();
+ if (rv) {
+ printk(BIOS_INFO, "Failed to lock rec hash space (%x)\n", rv);
+ vb2api_fail(&ctx, VB2_RECOVERY_RO_TPM_REC_HASH_L_ERROR, 0);
+ save_if_needed(&ctx);
+ vboot_reboot();
+ }
+
printk(BIOS_INFO, "Slot %c is selected\n", is_slot_a(&ctx) ? 'A' : 'B');
vb2_set_selected_region(region_device_region(&fw_main));
timestamp_add_now(TS_END_VBOOT);
More information about the coreboot-gerrit
mailing list