From abcba216a990ea60c5ea78d2f74f7fa58aec99f6 Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Wed, 28 Sep 2016 18:59:39 -0700 Subject: [PATCH] UPSTREAM: vboot: clear tpm when required Function which invoked when TPM clear is requested was left empty, this patch fixes it. BRANCH=gru BUG=chrome-os-partner:57411 TEST=verified on a chromeos device that tpm is in fact cleared when CLEAR_TPM_OWNER_REQUEST is set by userland. Signed-off-by: Vadim Bendebury Reviewed-on: https://review.coreboot.org/16805 Tested-by: build bot (Jenkins) Reviewed-by: Philipp Deppenwiese Change-Id: I4370792afd512309ecf7f4961ed4d44a04a3e2aa Reviewed-on: https://chromium-review.googlesource.com/391088 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- src/vboot/secdata_tpm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vboot/secdata_tpm.c b/src/vboot/secdata_tpm.c index a51e5d6d55..76b90abee6 100644 --- a/src/vboot/secdata_tpm.c +++ b/src/vboot/secdata_tpm.c @@ -154,6 +154,7 @@ static uint32_t _factory_initialize_tpm(struct vb2_context *ctx) uint32_t tpm_clear_and_reenable(void) { VBDEBUG("TPM: Clear and re-enable\n"); + RETURN_ON_FAILURE(tlcl_force_clear()); return TPM_SUCCESS; }