diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/tpm2_marshaling.c | 14 | ||||
-rw-r--r-- | src/lib/tpm2_tlcl.c | 27 | ||||
-rw-r--r-- | src/lib/tpm2_tlcl_structures.h | 5 |
3 files changed, 34 insertions, 12 deletions
diff --git a/src/lib/tpm2_marshaling.c b/src/lib/tpm2_marshaling.c index 9565aeab94..00c8f7d9f9 100644 --- a/src/lib/tpm2_marshaling.c +++ b/src/lib/tpm2_marshaling.c @@ -303,6 +303,15 @@ static void marshal_nv_write(void **buffer, marshal_u16(buffer, command_body->offset, buffer_space); } +static void marshal_nv_write_lock(void **buffer, + struct tpm2_nv_write_lock_cmd *command_body, + size_t *buffer_space) +{ + uint32_t handles[] = { TPM_RH_PLATFORM, command_body->nvIndex }; + marshal_common_session_header(buffer, handles, + ARRAY_SIZE(handles), buffer_space); +} + static void marshal_nv_read(void **buffer, struct tpm2_nv_read_cmd *command_body, size_t *buffer_space) @@ -364,6 +373,10 @@ int tpm_marshal_command(TPM_CC command, void *tpm_command_body, marshal_nv_write(&cmd_body, tpm_command_body, &body_size); break; + case TPM2_NV_WriteLock: + marshal_nv_write_lock(&cmd_body, tpm_command_body, &body_size); + break; + case TPM2_SelfTest: marshal_selftest(&cmd_body, tpm_command_body, &body_size); break; @@ -533,6 +546,7 @@ struct tpm2_response *tpm_unmarshal_response(TPM_CC command, case TPM2_Clear: case TPM2_NV_DefineSpace: case TPM2_NV_Write: + case TPM2_NV_WriteLock: /* Session data included in response can be safely ignored. */ cr_size = 0; break; diff --git a/src/lib/tpm2_tlcl.c b/src/lib/tpm2_tlcl.c index 312fe36414..3003400033 100644 --- a/src/lib/tpm2_tlcl.c +++ b/src/lib/tpm2_tlcl.c @@ -201,19 +201,22 @@ uint32_t tlcl_set_enable(void) return TPM_SUCCESS; } -uint32_t tlcl_set_global_lock(void) +uint32_t tlcl_lock_nv_write(uint32_t index) { - /* - * This is where the locking of the RO NVram index is supposed to - * happen. The most likely way to achieve it is to extend PCR used for - * policy when defining this space. - */ - printk(BIOS_INFO, "%s:%s:%d\n", __FILE__, __func__, __LINE__); - return TPM_SUCCESS; -} -uint32_t tlcl_set_nv_locked(void) -{ - printk(BIOS_INFO, "%s:%s:%d\n", __FILE__, __func__, __LINE__); + struct tpm2_response *response; + /* TPM Wll reject attempts to write at non-defined index. */ + struct tpm2_nv_write_lock_cmd nv_wl = { + .nvIndex = HR_NV_INDEX + index, + }; + + response = tpm_process_command(TPM2_NV_WriteLock, &nv_wl); + + printk(BIOS_INFO, "%s: response is %x\n", + __func__, response ? response->hdr.tpm_code : -1); + + if (!response || response->hdr.tpm_code) + return TPM_E_IOERROR; + return TPM_SUCCESS; } diff --git a/src/lib/tpm2_tlcl_structures.h b/src/lib/tpm2_tlcl_structures.h index 8e518583bc..1e7fcf05fa 100644 --- a/src/lib/tpm2_tlcl_structures.h +++ b/src/lib/tpm2_tlcl_structures.h @@ -59,6 +59,7 @@ struct tpm_header { #define TPM2_Clear ((TPM_CC)0x00000126) #define TPM2_NV_DefineSpace ((TPM_CC)0x0000012A) #define TPM2_NV_Write ((TPM_CC)0x00000137) +#define TPM2_NV_WriteLock ((TPM_CC)0x00000138) #define TPM2_SelfTest ((TPM_CC)0x00000143) #define TPM2_Startup ((TPM_CC)0x00000144) #define TPM2_NV_Read ((TPM_CC)0x0000014E) @@ -301,4 +302,8 @@ struct tpm2_nv_read_cmd { uint16_t offset; }; +struct tpm2_nv_write_lock_cmd { + TPMI_RH_NV_INDEX nvIndex; +}; + #endif // __SRC_LIB_TPM2_TLCL_STRUCTURES_H |