diff options
author | André Draszik <adraszik@tycoint.com> | 2017-10-03 16:55:51 +0100 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2017-11-16 19:10:29 -0700 |
commit | e8155dfe33eb2b3e538e8717d6578c1d08651454 (patch) | |
tree | a85c7bfbc75f9b028ec79069f48f8bcf5715ee0b /lib | |
parent | 3fe3839acc4a5d9b1af9b2ab3884b0d3f2e23370 (diff) |
tpm: fix reading of permanent flags
The offset of the permanent flags structure is in a different
place in the response compared to what the code is doing,
which gives us a completely useless result.
Fix by replacing hand-crafted code with generic parser
infrastructure.
Signed-off-by: André Draszik <adraszik@tycoint.com>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/tpm.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/tpm.c b/lib/tpm.c index d1cf5a8a167..5659fa5e18b 100644 --- a/lib/tpm.c +++ b/lib/tpm.c @@ -607,14 +607,24 @@ uint32_t tpm_get_permanent_flags(struct tpm_permanent_flags *pflags) 0x0, 0x0, 0x0, 0x4, /* subcap size */ 0x0, 0x0, 0x1, 0x8, /* subcap value */ }; + const size_t data_size_offset = TPM_HEADER_SIZE; + const size_t data_offset = TPM_HEADER_SIZE + sizeof (uint32_t); uint8_t response[COMMAND_BUFFER_SIZE]; size_t response_length = sizeof(response); uint32_t err; + uint32_t data_size; err = tpm_sendrecv_command(command, response, &response_length); if (err) return err; - memcpy(pflags, response + TPM_HEADER_SIZE, sizeof(*pflags)); + if (unpack_byte_string(response, response_length, "d", + data_size_offset, &data_size)) + return TPM_LIB_ERROR; + if (data_size < sizeof(*pflags)) + return TPM_LIB_ERROR; + if (unpack_byte_string(response, response_length, "s", + data_offset, pflags, sizeof(*pflags))) + return TPM_LIB_ERROR; return 0; } |