Re: [edk2-devel] [PATCH V2 1/8] OvmfPkg: Move TdxValidateCfv from PeilessStartupLib to PlatformInitLib
On June 27, 2022 4:41 PM, Gerd Hoffmann wrote: > On Mon, Jun 27, 2022 at 08:04:06AM +, Min Xu wrote: > > On June 27, 2022 3:02 PM, Gerd Hoffmann wrote: > > > On Sun, Jun 26, 2022 at 11:05:50AM +0800, Min Xu wrote: > > > > From: Min M Xu > > > > > > > > TdxValidateCfv validates the integrity of Configuration FV (CFV). > > > > It was implemented in PeilessStartupLib which is included in > IntelTdxX64. > > > > > > > --- a/OvmfPkg/Library/PlatformInitLib/IntelTdx.c > > > > +++ b/OvmfPkg/Library/PlatformInitLib/IntelTdx.c > > > > > > > +/** > > > > + Check the integrity of CFV data. > > > > + > > > > + @param[in] TdxCfvBase - A pointer to CFV header @param[in] > > > > + TdxCfvSize - CFV data size > > > > + > > > > + @retval TRUE - The CFV data is valid. > > > > + @retval FALSE - The CFV data is invalid. > > > > + > > > > +**/ > > > > +BOOLEAN > > > > +EFIAPI > > > > +TdxValidateCfv ( > > > > + IN UINT8 *TdxCfvBase, > > > > + IN UINT32 TdxCfvSize > > > > + ) > > > > > > Hmm, is there anything tdx-specific in this function? > > > Looks like generic verification of varstore structure to me. > > > > > There is no tdx-specific in this function. I will rename it to something > > more > generic. > > Also move out of IntelTdx.c please. Yes, it will be in Platform.c, together with PlatformInitEmuVariableNvStore and PlatformReserveEmuVariableNvStore. > > Does it make sense to call it right before calling > PlatformInitEmuVariableNvStore()? I think it can be called in PlatformInitEmuVariableNvStore, as it is a pre-check before copy over the content to EmuVariableNvStore. Thanks Min -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90829): https://edk2.groups.io/g/devel/message/90829 Mute This Topic: https://groups.io/mt/91995188/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH V2 1/8] OvmfPkg: Move TdxValidateCfv from PeilessStartupLib to PlatformInitLib
On Mon, Jun 27, 2022 at 08:04:06AM +, Min Xu wrote: > On June 27, 2022 3:02 PM, Gerd Hoffmann wrote: > > On Sun, Jun 26, 2022 at 11:05:50AM +0800, Min Xu wrote: > > > From: Min M Xu > > > > > > TdxValidateCfv validates the integrity of Configuration FV (CFV). It > > > was implemented in PeilessStartupLib which is included in IntelTdxX64. > > > > > --- a/OvmfPkg/Library/PlatformInitLib/IntelTdx.c > > > +++ b/OvmfPkg/Library/PlatformInitLib/IntelTdx.c > > > > > +/** > > > + Check the integrity of CFV data. > > > + > > > + @param[in] TdxCfvBase - A pointer to CFV header @param[in] > > > + TdxCfvSize - CFV data size > > > + > > > + @retval TRUE - The CFV data is valid. > > > + @retval FALSE - The CFV data is invalid. > > > + > > > +**/ > > > +BOOLEAN > > > +EFIAPI > > > +TdxValidateCfv ( > > > + IN UINT8 *TdxCfvBase, > > > + IN UINT32 TdxCfvSize > > > + ) > > > > Hmm, is there anything tdx-specific in this function? > > Looks like generic verification of varstore structure to me. > > > There is no tdx-specific in this function. I will rename it to something more > generic. Also move out of IntelTdx.c please. Does it make sense to call it right before calling PlatformInitEmuVariableNvStore()? take care, Gerd -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90788): https://edk2.groups.io/g/devel/message/90788 Mute This Topic: https://groups.io/mt/91995188/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH V2 1/8] OvmfPkg: Move TdxValidateCfv from PeilessStartupLib to PlatformInitLib
On June 27, 2022 3:02 PM, Gerd Hoffmann wrote: > On Sun, Jun 26, 2022 at 11:05:50AM +0800, Min Xu wrote: > > From: Min M Xu > > > > TdxValidateCfv validates the integrity of Configuration FV (CFV). It > > was implemented in PeilessStartupLib which is included in IntelTdxX64. > > > --- a/OvmfPkg/Library/PlatformInitLib/IntelTdx.c > > +++ b/OvmfPkg/Library/PlatformInitLib/IntelTdx.c > > > +/** > > + Check the integrity of CFV data. > > + > > + @param[in] TdxCfvBase - A pointer to CFV header @param[in] > > + TdxCfvSize - CFV data size > > + > > + @retval TRUE - The CFV data is valid. > > + @retval FALSE - The CFV data is invalid. > > + > > +**/ > > +BOOLEAN > > +EFIAPI > > +TdxValidateCfv ( > > + IN UINT8 *TdxCfvBase, > > + IN UINT32 TdxCfvSize > > + ) > > Hmm, is there anything tdx-specific in this function? > Looks like generic verification of varstore structure to me. > There is no tdx-specific in this function. I will rename it to something more generic. Thanks Min -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90787): https://edk2.groups.io/g/devel/message/90787 Mute This Topic: https://groups.io/mt/91995188/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH V2 1/8] OvmfPkg: Move TdxValidateCfv from PeilessStartupLib to PlatformInitLib
On Sun, Jun 26, 2022 at 11:05:50AM +0800, Min Xu wrote: > From: Min M Xu > > TdxValidateCfv validates the integrity of Configuration FV (CFV). It was > implemented in PeilessStartupLib which is included in IntelTdxX64. > --- a/OvmfPkg/Library/PlatformInitLib/IntelTdx.c > +++ b/OvmfPkg/Library/PlatformInitLib/IntelTdx.c > +/** > + Check the integrity of CFV data. > + > + @param[in] TdxCfvBase - A pointer to CFV header > + @param[in] TdxCfvSize - CFV data size > + > + @retval TRUE - The CFV data is valid. > + @retval FALSE - The CFV data is invalid. > + > +**/ > +BOOLEAN > +EFIAPI > +TdxValidateCfv ( > + IN UINT8 *TdxCfvBase, > + IN UINT32 TdxCfvSize > + ) Hmm, is there anything tdx-specific in this function? Looks like generic verification of varstore structure to me. take care, Gerd -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90782): https://edk2.groups.io/g/devel/message/90782 Mute This Topic: https://groups.io/mt/91995188/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [PATCH V2 1/8] OvmfPkg: Move TdxValidateCfv from PeilessStartupLib to PlatformInitLib
From: Min M Xu
TdxValidateCfv validates the integrity of Configuration FV (CFV). It was
implemented in PeilessStartupLib which is included in IntelTdxX64.
In OvmfPkgX64 we should validate CFV as well. So it is moved from
PeilessStartupLib to PlatformInitLib so that it can be called in both
OvmfPkgX64 and IntelTdxX64.
Cc: Erdem Aktas
Cc: James Bottomley
Cc: Jiewen Yao
Cc: Gerd Hoffmann
Cc: Tom Lendacky
Signed-off-by: Min Xu
---
OvmfPkg/Include/Library/PlatformInitLib.h | 17 ++
OvmfPkg/Library/PeilessStartupLib/IntelTdx.c | 153 --
.../PeilessStartupInternal.h | 17 --
OvmfPkg/Library/PlatformInitLib/IntelTdx.c| 153 ++
4 files changed, 170 insertions(+), 170 deletions(-)
diff --git a/OvmfPkg/Include/Library/PlatformInitLib.h
b/OvmfPkg/Include/Library/PlatformInitLib.h
index 2987a367cc9c..a3acfb1fb196 100644
--- a/OvmfPkg/Include/Library/PlatformInitLib.h
+++ b/OvmfPkg/Include/Library/PlatformInitLib.h
@@ -234,4 +234,21 @@ PlatformTdxPublishRamRegions (
VOID
);
+/**
+ Check the integrity of CFV data.
+
+ @param[in] TdxCfvBase - A pointer to CFV header
+ @param[in] TdxCfvSize - CFV data size
+
+ @retval TRUE - The CFV data is valid.
+ @retval FALSE - The CFV data is invalid.
+
+**/
+BOOLEAN
+EFIAPI
+TdxValidateCfv (
+ IN UINT8 *TdxCfvBase,
+ IN UINT32 TdxCfvSize
+ );
+
#endif // PLATFORM_INIT_LIB_H_
diff --git a/OvmfPkg/Library/PeilessStartupLib/IntelTdx.c
b/OvmfPkg/Library/PeilessStartupLib/IntelTdx.c
index 484fd21057c8..216c413caad5 100644
--- a/OvmfPkg/Library/PeilessStartupLib/IntelTdx.c
+++ b/OvmfPkg/Library/PeilessStartupLib/IntelTdx.c
@@ -7,8 +7,6 @@
#include
#include
#include
-#include
-#include
#include
#include
#include
@@ -37,157 +35,6 @@ typedef struct {
#pragma pack()
-/**
- Check padding data all bit should be 1.
-
- @param[in] Buffer - A pointer to buffer header
- @param[in] BufferSize - Buffer size
-
- @retval TRUE - The padding data is valid.
- @retval TRUE - The padding data is invalid.
-
-**/
-BOOLEAN
-CheckPaddingData (
- IN UINT8 *Buffer,
- IN UINT32 BufferSize
- )
-{
- UINT32 index;
-
- for (index = 0; index < BufferSize; index++) {
-if (Buffer[index] != 0xFF) {
- return FALSE;
-}
- }
-
- return TRUE;
-}
-
-/**
- Check the integrity of CFV data.
-
- @param[in] TdxCfvBase - A pointer to CFV header
- @param[in] TdxCfvSize - CFV data size
-
- @retval TRUE - The CFV data is valid.
- @retval FALSE - The CFV data is invalid.
-
-**/
-BOOLEAN
-EFIAPI
-TdxValidateCfv (
- IN UINT8 *TdxCfvBase,
- IN UINT32 TdxCfvSize
- )
-{
- UINT16 Checksum;
- UINTN VariableBase;
- UINT32 VariableOffset;
- UINT32 VariableOffsetBeforeAlign;
- EFI_FIRMWARE_VOLUME_HEADER *CfvFvHeader;
- VARIABLE_STORE_HEADER *CfvVariableStoreHeader;
- AUTHENTICATED_VARIABLE_HEADER *VariableHeader;
-
- static EFI_GUID FvHdrGUID = EFI_SYSTEM_NV_DATA_FV_GUID;
- static EFI_GUID VarStoreHdrGUID = EFI_AUTHENTICATED_VARIABLE_GUID;
-
- VariableOffset = 0;
-
- if (TdxCfvBase == NULL) {
-DEBUG ((DEBUG_ERROR, "TDX CFV: CFV pointer is NULL\n"));
-return FALSE;
- }
-
- //
- // Verify the header zerovetor, filesystemguid,
- // revision, signature, attributes, fvlength, checksum
- // HeaderLength cannot be an odd number
- //
- CfvFvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)TdxCfvBase;
-
- if ((!IsZeroBuffer (CfvFvHeader->ZeroVector, 16)) ||
- (!CompareGuid (, >FileSystemGuid)) ||
- (CfvFvHeader->Signature != EFI_FVH_SIGNATURE) ||
- (CfvFvHeader->Attributes != 0x4feff) ||
- (CfvFvHeader->Revision != EFI_FVH_REVISION) ||
- (CfvFvHeader->FvLength != TdxCfvSize)
- )
- {
-DEBUG ((DEBUG_ERROR, "TDX CFV: Basic FV headers were invalid\n"));
-return FALSE;
- }
-
- //
- // Verify the header checksum
- //
- Checksum = CalculateSum16 ((VOID *)CfvFvHeader, CfvFvHeader->HeaderLength);
-
- if (Checksum != 0) {
-DEBUG ((DEBUG_ERROR, "TDX CFV: FV checksum was invalid\n"));
-return FALSE;
- }
-
- //
- // Verify the header signature, size, format, state
- //
- CfvVariableStoreHeader = (VARIABLE_STORE_HEADER *)(TdxCfvBase +
CfvFvHeader->HeaderLength);
- if ((!CompareGuid (, >Signature)) ||
- (CfvVariableStoreHeader->Format != VARIABLE_STORE_FORMATTED) ||
- (CfvVariableStoreHeader->State != VARIABLE_STORE_HEALTHY) ||
- (CfvVariableStoreHeader->Size > (CfvFvHeader->FvLength -
CfvFvHeader->HeaderLength)) ||
- (CfvVariableStoreHeader->Size < sizeof (VARIABLE_STORE_HEADER))
- )
- {
-DEBUG ((DEBUG_ERROR, "TDX CFV: Variable Store header was invalid\n"));
-return FALSE;
- }
-
- //
- // Verify the header startId, state
- // Verify data to the end
- //
- VariableBase = (UINTN)TdxCfvBase + CfvFvHeader->HeaderLength + sizeof
(VARIABLE_STORE_HEADER);
- while
