tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SecurityPkg/Tcg2StandaloneMm:Consume gEdkiiTpmInstanceHobGuid 

Consume gEdkiiTpmInstanceHobGuid in Tcg2StandaloneMm
driver. It's to avoid using dynamic PcdTpmInstanceGuid
in StandaloneMm driver.

Signed-off-by: Dun Tan <dun.tan@intel.com>
This commit is contained in:
Dun Tan 2024-05-24 17:03:02 +08:00 committed by mergify[bot]
parent cb38d27f1d
commit 97ede07beb
5 changed files with 61 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
View File

@ -9,7 +9,7 @@
PhysicalPresenceCallback() and MemoryClearCallback() will receive untrusted input and do some check. PhysicalPresenceCallback() and MemoryClearCallback() will receive untrusted input and do some check.
Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2015 - 2024, Intel Corporation. All rights reserved.<BR>
Copyright (c) Microsoft Corporation. Copyright (c) Microsoft Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
@ -285,7 +285,7 @@ InitializeTcgCommon (
EFI_HANDLE McSwHandle; EFI_HANDLE McSwHandle;
EFI_HANDLE NotifyHandle; EFI_HANDLE NotifyHandle;
if (!CompareGuid (PcdGetPtr (PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceTpm20DtpmGuid)) { if (!IsTpm20Dtpm ()) {
DEBUG ((DEBUG_ERROR, "No TPM2 DTPM instance required!\n")); DEBUG ((DEBUG_ERROR, "No TPM2 DTPM instance required!\n"));
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }

13
SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
The header file for Tcg2 SMM driver. The header file for Tcg2 SMM driver.
Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2015 - 2024, Intel Corporation. All rights reserved.<BR>
Copyright (c) Microsoft Corporation. Copyright (c) Microsoft Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
@ -84,4 +84,15 @@ InitializeTcgCommon (
VOID VOID
); );
/**
This function checks if the required DTPM instance is TPM 2.0.
@retval TRUE The required DTPM instance is equal to gEfiTpmDeviceInstanceTpm20DtpmGuid.
@retval FALSE The required DTPM instance is not equal to gEfiTpmDeviceInstanceTpm20DtpmGuid.
**/
BOOLEAN
IsTpm20Dtpm (
VOID
);
#endif // __TCG_SMM_H__ #endif // __TCG_SMM_H__

30
SecurityPkg/Tcg/Tcg2Smm/Tcg2StandaloneMm.c
View File

@ -9,7 +9,7 @@
PhysicalPresenceCallback() and MemoryClearCallback() will receive untrusted input and do some check. PhysicalPresenceCallback() and MemoryClearCallback() will receive untrusted input and do some check.
Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2015 - 2024, Intel Corporation. All rights reserved.<BR>
Copyright (c) Microsoft Corporation. Copyright (c) Microsoft Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
@ -17,6 +17,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include "Tcg2Smm.h" #include "Tcg2Smm.h"
#include <Library/StandaloneMmMemLib.h> #include <Library/StandaloneMmMemLib.h>
#include <Library/HobLib.h>
/** /**
Notify the system that the SMM variable driver is ready. Notify the system that the SMM variable driver is ready.
@ -47,6 +48,33 @@ IsBufferOutsideMmValid (
return MmIsBufferOutsideMmValid (Buffer, Length); return MmIsBufferOutsideMmValid (Buffer, Length);
} }
/**
This function checks if the required DTPM instance is TPM 2.0.
@retval TRUE The required DTPM instance is equal to gEfiTpmDeviceInstanceTpm20DtpmGuid.
@retval FALSE The required DTPM instance is not equal to gEfiTpmDeviceInstanceTpm20DtpmGuid.
**/
BOOLEAN
IsTpm20Dtpm (
VOID
)
{
VOID *GuidHob;
GuidHob = GetFirstGuidHob (&gEdkiiTpmInstanceHobGuid);
if (GuidHob != NULL) {
if (CompareGuid ((EFI_GUID *)GET_GUID_HOB_DATA (GuidHob), &gEfiTpmDeviceInstanceTpm20DtpmGuid)) {
return TRUE;
}
DEBUG ((DEBUG_ERROR, "No TPM2 DTPM instance required! - %g\n", (EFI_GUID *)GET_GUID_HOB_DATA (GuidHob)));
} else {
DEBUG ((DEBUG_ERROR, "No gEdkiiTpmInstanceHobGuid!\n"));
}
return FALSE;
}
/** /**
The driver's entry point. The driver's entry point.

7
SecurityPkg/Tcg/Tcg2Smm/Tcg2StandaloneMm.inf
View File

@ -20,7 +20,7 @@
# This driver will have external input - variable and ACPINvs data in SMM mode. # This driver will have external input - variable and ACPINvs data in SMM mode.
# This external input must be validated carefully to avoid security issue. # This external input must be validated carefully to avoid security issue.
# #
# Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2015 - 2024, Intel Corporation. All rights reserved.<BR>
# Copyright (c) Microsoft Corporation.<BR> # Copyright (c) Microsoft Corporation.<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent # SPDX-License-Identifier: BSD-2-Clause-Patent
# #
@ -55,6 +55,7 @@
Tcg2PhysicalPresenceLib Tcg2PhysicalPresenceLib
PcdLib PcdLib
MemLib MemLib
HobLib
[Guids] [Guids]
## SOMETIMES_PRODUCES ## Variable:L"MemoryOverwriteRequestControl" ## SOMETIMES_PRODUCES ## Variable:L"MemoryOverwriteRequestControl"
@ -63,15 +64,13 @@
gEfiTpmDeviceInstanceTpm20DtpmGuid ## PRODUCES ## GUID # TPM device identifier gEfiTpmDeviceInstanceTpm20DtpmGuid ## PRODUCES ## GUID # TPM device identifier
gTpmNvsMmGuid ## CONSUMES gTpmNvsMmGuid ## CONSUMES
gEdkiiTpmInstanceHobGuid
[Protocols] [Protocols]
gEfiSmmSwDispatch2ProtocolGuid ## CONSUMES gEfiSmmSwDispatch2ProtocolGuid ## CONSUMES
gEfiSmmVariableProtocolGuid ## CONSUMES gEfiSmmVariableProtocolGuid ## CONSUMES
gEfiMmReadyToLockProtocolGuid ## CONSUMES gEfiMmReadyToLockProtocolGuid ## CONSUMES
[Pcd]
gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid ## CONSUMES
[Depex] [Depex]
gEfiSmmSwDispatch2ProtocolGuid AND gEfiSmmSwDispatch2ProtocolGuid AND
gEfiSmmVariableProtocolGuid gEfiSmmVariableProtocolGuid

16
SecurityPkg/Tcg/Tcg2Smm/Tcg2TraditionalMm.c
View File

@ -9,7 +9,7 @@
PhysicalPresenceCallback() and MemoryClearCallback() will receive untrusted input and do some check. PhysicalPresenceCallback() and MemoryClearCallback() will receive untrusted input and do some check.
Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2015 - 2024, Intel Corporation. All rights reserved.<BR>
Copyright (c) Microsoft Corporation. Copyright (c) Microsoft Corporation.
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
@ -58,6 +58,20 @@ IsBufferOutsideMmValid (
return SmmIsBufferOutsideSmmValid (Buffer, Length); return SmmIsBufferOutsideSmmValid (Buffer, Length);
} }
/**
This function checks if the required DTPM instance is TPM 2.0.
@retval TRUE The required DTPM instance is equal to gEfiTpmDeviceInstanceTpm20DtpmGuid.
@retval FALSE The required DTPM instance is not equal to gEfiTpmDeviceInstanceTpm20DtpmGuid.
**/
BOOLEAN
IsTpm20Dtpm (
VOID
)
{
return CompareGuid (PcdGetPtr (PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceTpm20DtpmGuid);
}
/** /**
The driver's entry point. The driver's entry point.