From: Stefan Berger <stefanb@linux.vnet.ibm.com>
To: devel@edk2.groups.io
Cc: mhaeuser@posteo.de, spbrogan@outlook.com,
marcandre.lureau@redhat.com, kraxel@redhat.com,
jiewen.yao@intel.com, Stefan Berger <stefanb@linux.vnet.ibm.com>,
Stefan Berger <stefanb@linux.ibm.com>
Subject: [PATCH v6 7/9] SecurityPkg: Disable TPM platform hierarchy if TPM resume fails (S3 resume)
Date: Wed, 8 Sep 2021 08:46:42 -0400 [thread overview]
Message-ID: <20210908124644.816856-8-stefanb@linux.vnet.ibm.com> (raw)
In-Reply-To: <20210908124644.816856-1-stefanb@linux.vnet.ibm.com>
If Tpm2Startup(TPM_SU_STATE) fails, call ConfigureTPMPlatformHierarchy()
to disable the platform hierarchy.
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c | 2 ++
SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf | 1 +
2 files changed, 3 insertions(+)
diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
index 93a8803ff6..63323b9509 100644
--- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
+++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
@@ -30,6 +30,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include <Library/PeimEntryPoint.h>
#include <Library/Tpm2CommandLib.h>
#include <Library/Tpm2DeviceLib.h>
+#include <Library/TpmPlatformHierarchyLib.h>
#include <Library/HashLib.h>
#include <Library/HobLib.h>
#include <Library/PcdLib.h>
@@ -1050,6 +1051,7 @@ PeimEntryMA (
if (!EFI_ERROR(Status)) {
S3ErrorReport = TRUE;
}
+ ConfigureTpmPlatformHierarchy ();
}
} else {
Status = Tpm2Startup (TPM_SU_CLEAR);
diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf
index 06c26a2904..2f4988eb6b 100644
--- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf
+++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf
@@ -55,6 +55,7 @@
ReportStatusCodeLib
ResetSystemLib
PrintLib
+ TpmPlatformHierarchyLib
[Guids]
gTcgEventEntryHobGuid ## PRODUCES ## HOB
--
2.31.1
next prev parent reply other threads:[~2021-09-08 12:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-08 12:46 [PATCH v6 0/9] Ovmf: Disable the TPM2 platform hierarchy Stefan Berger
2021-09-08 12:46 ` [PATCH v6 1/9] SecurityPkg/TPM: Import PeiDxeTpmPlatformHierarchyLib.c from edk2-platforms Stefan Berger
2021-09-08 12:46 ` [PATCH v6 2/9] SecurityPkg/TPM: Fix bugs in imported PeiDxeTpmPlatformHierarchyLib Stefan Berger
2021-09-08 12:46 ` [PATCH v6 3/9] SecurityPkg/TPM: Add a NULL implementation of TpmPlatformHierarchyLib Stefan Berger
2021-09-08 12:46 ` [PATCH v6 4/9] SecurityPkg: Introduce new PCD PcdRandomizePlatformHierarchy Stefan Berger
2021-09-08 12:46 ` [PATCH v6 5/9] OvmfPkg: Reference new TPM classes in the build system for compilation Stefan Berger
2021-09-08 12:46 ` [PATCH v6 6/9] OvmfPkg: Disable the TPM2 platform hierarchy Stefan Berger
2021-09-08 12:46 ` Stefan Berger [this message]
2021-09-08 12:46 ` [PATCH v6 8/9] ArmVirtPkg: Reference new TPM classes in the build system for compilation Stefan Berger
2021-09-08 12:46 ` [PATCH v6 9/9] ArmVirtPkg: Disable the TPM2 platform hierarchy Stefan Berger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210908124644.816856-8-stefanb@linux.vnet.ibm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox