sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security/vboot/tpm: Avoid duplicate vb2api_secdata_firmware_create calls

Browse Source 
For TPM2, vb2api_secdata_firmware_create() is already called from
setup_firmware_space() from _factory_initialize_tpm(). Therefore move
the duplicate call from factory_initialize_tpm() to TPM1's
_factory_initialize_tpm().

Change-Id: I892df65c847e1aeeabef8a7578bec743b639a127
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67219
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aseda Aboagye <aaboagye@google.com>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Yu-Ping Wu
2022-08-31 14:52:46 +08:00
committed by Martin L Roth
parent 8b45c1244e
commit 74a00b9cec
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/security/vboot/secdata_tpm.c
View File

@ -488,6 +488,7 @@ static uint32_t _factory_initialize_tpm(struct vb2_context *ctx)
TPM_PERMANENT_FLAGS pflags; TPM_PERMANENT_FLAGS pflags;
uint32_t result; uint32_t result;
vb2api_secdata_firmware_create(ctx);
vb2api_secdata_kernel_create_v0(ctx); vb2api_secdata_kernel_create_v0(ctx);
result = tlcl_get_permanent_flags(&pflags); result = tlcl_get_permanent_flags(&pflags);
@ -558,12 +559,6 @@ static uint32_t factory_initialize_tpm(struct vb2_context *ctx)
{ {
uint32_t result; uint32_t result;
/*
* Set initial values of secdata_firmware space.
* kernel space is created in _factory_initialize_tpm().
*/
vb2api_secdata_firmware_create(ctx);
VBDEBUG("TPM: factory initialization\n"); VBDEBUG("TPM: factory initialization\n");
/* /*