diff options
| author | Kun Qin <kuqin@microsoft.com> | 2025-05-13 15:24:56 -0700 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2025-06-26 21:43:56 +0000 |
| commit | 6b7a3e05f06843af98d91d76f2c80bbb73780647 (patch) | |
| tree | 19d6e908a04524c4c64b3e201fbb9f00c1ed7f23 | |
| parent | 1634dd5b9396702556aa784cfd47c3408d72006f (diff) | |
| download | edk2-6b7a3e05f06843af98d91d76f2c80bbb73780647.zip edk2-6b7a3e05f06843af98d91d76f2c80bbb73780647.tar.gz edk2-6b7a3e05f06843af98d91d76f2c80bbb73780647.tar.bz2 | |
ArmPkg: ArmStandaloneMmCoreEntryPoint: Add MM communicate v3 support
As the standalone MM core begins supporting MM Communicate v3, this
update extends its functionality to incorporate MM Communicate v3
headers, enabling compatibility with the new protocol.
Signed-off-by: Kun Qin <kun.qin@microsoft.com>
| -rw-r--r-- | ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.c | 52 | ||||
| -rw-r--r-- | ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.inf | 1 |
2 files changed, 44 insertions, 9 deletions
diff --git a/ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.c b/ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.c index 5219483..86e4214 100644 --- a/ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.c +++ b/ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.c @@ -36,6 +36,7 @@ #include <Library/BaseMemoryLib.h>
#include <Library/SerialPortLib.h>
#include <Library/StandaloneMmMmuLib.h>
+#include <Library/SafeIntLib.h>
#include <Library/PcdLib.h>
#include <IndustryStandard/ArmStdSmc.h>
@@ -45,6 +46,8 @@ #include <Protocol/PiMmCpuDriverEp.h>
#include <Protocol/MmCommunication.h>
+#include <Protocol/MmCommunication2.h>
+#include <Protocol/MmCommunication3.h>
extern EFI_MM_SYSTEM_TABLE gMmCoreMmst;
@@ -443,7 +446,9 @@ GetServiceType ( IN EFI_GUID *ServiceGuid
)
{
- if (CompareGuid (ServiceGuid, &gEfiMmCommunication2ProtocolGuid)) {
+ if (CompareGuid (ServiceGuid, &gEfiMmCommunication2ProtocolGuid) ||
+ CompareGuid (ServiceGuid, &gEfiMmCommunication3ProtocolGuid))
+ {
return ServiceTypeMmCommunication;
}
@@ -467,10 +472,14 @@ ValidateMmCommBufferAddr ( IN UINTN CommBufferAddr
)
{
- UINT64 NsCommBufferEnd;
- UINT64 SCommBufferEnd;
- UINT64 CommBufferEnd;
- UINT64 CommBufferRange;
+ UINT64 NsCommBufferEnd;
+ UINT64 SCommBufferEnd;
+ UINT64 CommBufferEnd;
+ UINT64 CommBufferRange;
+ UINT64 BufferSize;
+ UINT64 BufferEnd;
+ EFI_MM_COMMUNICATE_HEADER_V3 *CommBufferHeaderV3;
+ EFI_STATUS Status;
NsCommBufferEnd = mNsCommBuffer->PhysicalStart + mNsCommBuffer->PhysicalSize;
SCommBufferEnd = mSCommBuffer->PhysicalStart + mSCommBuffer->PhysicalSize;
@@ -493,11 +502,36 @@ ValidateMmCommBufferAddr ( return EFI_ACCESS_DENIED;
}
- // perform bounds check.
- if (((CommBufferAddr + sizeof (EFI_MM_COMMUNICATE_HEADER) +
- ((EFI_MM_COMMUNICATE_HEADER *)CommBufferAddr)->MessageLength)) >
- CommBufferEnd)
+ if (CompareGuid (
+ &((EFI_MM_COMMUNICATE_HEADER *)CommBufferAddr)->HeaderGuid,
+ &gEfiMmCommunicateHeaderV3Guid
+ ))
{
+ CommBufferHeaderV3 = (EFI_MM_COMMUNICATE_HEADER_V3 *)CommBufferAddr;
+ Status = SafeUint64Add (
+ CommBufferHeaderV3->MessageSize,
+ sizeof (EFI_MM_COMMUNICATE_HEADER_V3),
+ &BufferSize
+ );
+ if (EFI_ERROR (Status)) {
+ return EFI_ACCESS_DENIED;
+ }
+ } else {
+ BufferSize = ((EFI_MM_COMMUNICATE_HEADER *)CommBufferAddr)->MessageLength +
+ OFFSET_OF (EFI_MM_COMMUNICATE_HEADER, Data);
+ }
+
+ Status = SafeUint64Add (
+ CommBufferAddr,
+ BufferSize,
+ &BufferEnd
+ );
+ if (EFI_ERROR (Status)) {
+ return EFI_ACCESS_DENIED;
+ }
+
+ // perform bounds check.
+ if (BufferEnd > CommBufferEnd) {
return EFI_ACCESS_DENIED;
}
diff --git a/ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.inf b/ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.inf index 0e9aab7..e94a266 100644 --- a/ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.inf +++ b/ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.inf @@ -59,6 +59,7 @@ [Protocols]
gEdkiiPiMmCpuDriverEpProtocolGuid
gEfiMmCommunication2ProtocolGuid
+ gEfiMmCommunication3ProtocolGuid
[Pcd]
gArmTokenSpaceGuid.PcdStMmStackSize
|