diff options
| author | Randall Spangler <rspangler@chromium.org> | 2011-03-17 16:10:21 -0700 |
|---|---|---|
| committer | Randall Spangler <rspangler@chromium.org> | 2011-03-17 16:10:21 -0700 |
| commit | f4ba19d81d4fefa0dba4efbdd57dc863138fde3a (patch) | |
| tree | 74e8c21df11f1953d56a6e05c9e31ac9ab75f2f7 /firmware/lib/vboot_common.c | |
| parent | 83c3714ed39459e69d30d22ee087f1119fbb69a4 (diff) | |
| download | vboot-f4ba19d81d4fefa0dba4efbdd57dc863138fde3a.tar.gz | |
Add VbSharedData field parsing
R=reinauer@chromium.org
BUG=chrome-os-partner:2578
TEST=manual
crossystem vdat_timers
should show 'LFS=0,0 LF=number1,number2 LK=number3,number4'
where number1 < number2 < number3 < number4
crossystem vdat_lfdebug
run from a dev mode console, should show
'check=12,0 index=0x00 tpmver=(hex number) lowestver=(hex number)'
crossystem vdat_flags
run from a dev mode console, flags should be 0x04.
Review URL: http://codereview.chromium.org/6685068
Change-Id: Id7b958ae300d10cdcdc1b17a1bb17b7e5069166f
Diffstat (limited to 'firmware/lib/vboot_common.c')
| -rw-r--r-- | firmware/lib/vboot_common.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/firmware/lib/vboot_common.c b/firmware/lib/vboot_common.c index abba130b..edc6e163 100644 --- a/firmware/lib/vboot_common.c +++ b/firmware/lib/vboot_common.c @@ -381,6 +381,10 @@ int VerifyKernelPreamble(const VbKernelPreambleHeader* preamble, int VbSharedDataInit(VbSharedDataHeader* header, uint64_t size) { + + VBDEBUG(("VbSharedDataInit, %d bytes, header %d bytes\n", (int)size, + sizeof(VbSharedDataHeader))); + if (size < sizeof(VbSharedDataHeader)) { VBDEBUG(("Not enough data for header.\n")); return VBOOT_SHARED_DATA_INVALID; @@ -397,10 +401,12 @@ int VbSharedDataInit(VbSharedDataHeader* header, uint64_t size) { Memset(header, 0, sizeof(VbSharedDataHeader)); /* Initialize fields */ + header->magic = VB_SHARED_DATA_MAGIC; header->struct_version = VB_SHARED_DATA_VERSION; header->struct_size = sizeof(VbSharedDataHeader); header->data_size = size; header->data_used = sizeof(VbSharedDataHeader); + header->firmware_index = 0xFF; /* Success */ return VBOOT_SUCCESS; @@ -410,6 +416,8 @@ int VbSharedDataInit(VbSharedDataHeader* header, uint64_t size) { uint64_t VbSharedDataReserve(VbSharedDataHeader* header, uint64_t size) { uint64_t offs = header->data_used; + VBDEBUG(("VbSharedDataReserve %d bytes at %d\n", (int)size, (int)offs)); + if (!header || size > header->data_size - header->data_used) { VBDEBUG(("VbSharedData buffer out of space.\n")); return 0; /* Not initialized, or not enough space left. */ |