From 60b6f09c80cc88d10e968a47a371f7f685b64b6e Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Fri, 11 Nov 2016 14:15:31 -0800 Subject: [PATCH] UPSTREAM: vboot: TPM2 - report attempts to re-create NVRAM spaces Currently the tlcl_define_space() function returns the same error value for any non-zero TPM response code. The thing is that the caller might want to allow attempts to re-create existing NVRAM spaces. This patch adds a new API return value to indicate this condition and uses it as appropriate. BRANCH=none BUG=chrome-os-partner:59654 TEST=for test purposes modified the code not to create the firmware space, wiped out the TPM NVRAM and booted the device. Observed it create kernel and MRC index spaces on the first boot and then reporting return code 0x14c for already existing spaces on the following restarts. Signed-off-by: Vadim Bendebury Reviewed-on: https://review.coreboot.org/17422 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Change-Id: Ic183eb45e73edfbccf11cc19fd2f64f64274bfb2 Reviewed-on: https://chromium-review.googlesource.com/412047 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- src/include/tpm_lite/tss_constants.h | 5 +++++ src/lib/tpm2_tlcl.c | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/include/tpm_lite/tss_constants.h b/src/include/tpm_lite/tss_constants.h index 883a5ad85e..eda7d6b31b 100644 --- a/src/include/tpm_lite/tss_constants.h +++ b/src/include/tpm_lite/tss_constants.h @@ -40,6 +40,7 @@ #define TPM_E_WRITE_FAILURE ((uint32_t)0x00005008) /* vboot local */ #define TPM_E_READ_EMPTY ((uint32_t)0x00005009) /* vboot local */ #define TPM_E_READ_FAILURE ((uint32_t)0x0000500a) /* vboot local */ +#define TPM_E_NV_DEFINED ((uint32_t)0x0000500b) /* vboot local */ #define TPM_NV_INDEX0 ((uint32_t)0x00000000) #define TPM_NV_INDEX_LOCK ((uint32_t)0xffffffff) @@ -56,6 +57,10 @@ #define TPM_TAG_RSP_AUTH1_COMMAND ((uint16_t) 0xc5) #define TPM_TAG_RSP_AUTH2_COMMAND ((uint16_t) 0xc6) +/* Some TPM2 return codes used in this library. */ +#define TPM2_RC_SUCCESS 0 +#define TPM2_RC_NV_DEFINED 0x14c + typedef uint8_t TSS_BOOL; typedef uint16_t TPM_STRUCTURE_TAG; diff --git a/src/lib/tpm2_tlcl.c b/src/lib/tpm2_tlcl.c index 457e874798..6f5243e160 100644 --- a/src/lib/tpm2_tlcl.c +++ b/src/lib/tpm2_tlcl.c @@ -359,6 +359,13 @@ uint32_t tlcl_define_space(uint32_t space_index, size_t space_size) if (!response) return TPM_E_NO_DEVICE; - return response->hdr.tpm_code ? TPM_E_INTERNAL_INCONSISTENCY : - TPM_SUCCESS; + /* Map TPM2 retrun codes into common vboot represenation. */ + switch(response->hdr.tpm_code) { + case TPM2_RC_SUCCESS: + return TPM_SUCCESS; + case TPM2_RC_NV_DEFINED: + return TPM_E_NV_DEFINED; + default: + return TPM_E_INTERNAL_INCONSISTENCY; + } }