summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2019-07-31 18:59:52 +0800
committerCommit Bot <commit-bot@chromium.org>2019-08-21 04:02:04 +0000
commit687e25f025a8801a2ad615d206b95ed813ef6ccb (patch)
treee67f629c71613277a4cf8f5c8fd3182c65f1fc37
parentf03e2415b2525bd2c5e24b60ca7df67b51a8e903 (diff)
downloadvboot-687e25f025a8801a2ad615d206b95ed813ef6ccb.tar.gz
vboot/secdata: print secdata/secdatak on reads and writes
This makes it clear exactly when reads/writes are occurring, with what values. BUG=b:124141368, chromium:972956 TEST=make clean && make runtests BRANCH=none Change-Id: I614204cc19d2c90d2ac5799f136daf251a45e251 Signed-off-by: Joel Kitching <kitching@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1728299 Tested-by: Joel Kitching <kitching@chromium.org> Commit-Queue: Joel Kitching <kitching@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
-rw-r--r--firmware/lib/rollback_index.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/firmware/lib/rollback_index.c b/firmware/lib/rollback_index.c
index fbb706e9..b7549bba 100644
--- a/firmware/lib/rollback_index.c
+++ b/firmware/lib/rollback_index.c
@@ -46,6 +46,14 @@ uint32_t WriteSpaceKernel(RollbackSpaceKernel *rsk);
} \
} while (0)
+#define PRINT_BYTES(title, value) do { \
+ int i; \
+ VB2_DEBUG(title); \
+ VB2_DEBUG_RAW(":"); \
+ for (i = 0; i < sizeof(*(value)); i++) \
+ VB2_DEBUG_RAW(" %02x", *((uint8_t *)(value) + i)); \
+ VB2_DEBUG_RAW("\n"); \
+ } while (0)
uint32_t TPMClearAndReenable(void)
{
@@ -78,6 +86,7 @@ uint32_t ReadSpaceFirmware(RollbackSpaceFirmware *rsf)
VB2_DEBUG("TPM: read secdata returned 0x%x\n", r);
return r;
}
+ PRINT_BYTES("TPM: read secdata", rsf);
if (rsf->struct_version < ROLLBACK_SPACE_FIRMWARE_VERSION)
return TPM_E_STRUCT_VERSION;
@@ -96,6 +105,7 @@ uint32_t WriteSpaceFirmware(RollbackSpaceFirmware *rsf)
rsf->crc8 = vb2_crc8(rsf, offsetof(RollbackSpaceFirmware, crc8));
+ PRINT_BYTES("TPM: write secdata", rsf);
r = SafeWrite(FIRMWARE_NV_INDEX, rsf, sizeof(RollbackSpaceFirmware));
if (TPM_SUCCESS != r) {
VB2_DEBUG("TPM: write secdata failure\n");
@@ -138,6 +148,7 @@ uint32_t ReadSpaceKernel(RollbackSpaceKernel *rsk)
VB2_DEBUG("TPM: read secdatak returned 0x%x\n", r);
return r;
}
+ PRINT_BYTES("TPM: read secdatak", rsk);
if (rsk->struct_version < ROLLBACK_SPACE_FIRMWARE_VERSION)
return TPM_E_STRUCT_VERSION;
@@ -156,6 +167,7 @@ uint32_t WriteSpaceKernel(RollbackSpaceKernel *rsk)
rsk->crc8 = vb2_crc8(rsk, offsetof(RollbackSpaceKernel, crc8));
+ PRINT_BYTES("TPM: write secdatak", rsk);
r = SafeWrite(KERNEL_NV_INDEX, rsk, sizeof(RollbackSpaceKernel));
if (TPM_SUCCESS != r) {
VB2_DEBUG("TPM: write secdatak failure\n");