sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SecurityPkg OpalPasswordSmm: Consume SmmIoLib.

Browse Source 
Update code to consume SmmIoLib to check Mmio validation.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
(cherry picked from commit 50e6bb98ee)
This commit is contained in:
Eric Dong
2017-05-03 09:22:26 +08:00
parent 2078ead60d
commit 7154167901
4 changed files with 3 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalPasswordSmm.c
View File

@@ -61,9 +61,6 @@ VOID *mBuffer = NULL; // DMA can not read/write Data to smram, s
// NVME
NVME_CONTEXT mNvmeContext;
EFI_GCD_MEMORY_SPACE_DESCRIPTOR *mGcdMemSpace = NULL;
UINTN mNumberOfDescriptors = 0;
/**
Add new bridge node or nvme device info to the device list.
@@ -647,44 +644,6 @@ S3SleepEntryCallBack (
return Status;
}
/**
OpalPassword Notification for SMM EndOfDxe protocol.
@param[in] Protocol Points to the protocol's unique identifier.
@param[in] Interface Points to the interface instance.
@param[in] Handle The handle on which the interface was installed.
@retval EFI_SUCCESS Notification runs successfully.
**/
EFI_STATUS
EFIAPI
OpalPasswordEndOfDxeNotification (
IN CONST EFI_GUID *Protocol,
IN VOID *Interface,
IN EFI_HANDLE Handle
)
{
UINTN NumberOfDescriptors;
EFI_GCD_MEMORY_SPACE_DESCRIPTOR *MemSpaceMap;
EFI_STATUS Status;
Status = gDS->GetMemorySpaceMap (&NumberOfDescriptors, &MemSpaceMap);
if (EFI_ERROR (Status)) {
return Status;
}
mGcdMemSpace = AllocateCopyPool (NumberOfDescriptors * sizeof (EFI_GCD_MEMORY_SPACE_DESCRIPTOR), MemSpaceMap);
if (EFI_ERROR (Status)) {
gBS->FreePool (MemSpaceMap);
return Status;
}
mNumberOfDescriptors = NumberOfDescriptors;
gBS->FreePool (MemSpaceMap);
return EFI_SUCCESS;
}
/**
Main entry for this driver.
@@ -711,7 +670,6 @@ OpalPasswordSmmInit (
EFI_SMM_VARIABLE_PROTOCOL *SmmVariable;
OPAL_EXTRA_INFO_VAR OpalExtraInfo;
UINTN DataSize;
EFI_EVENT EndOfDxeEvent;
EFI_PHYSICAL_ADDRESS Address;
mBuffer = NULL;
@@ -820,15 +778,6 @@ OpalPasswordSmmInit (
//
mSwSmiValue = (UINT8) Context.SwSmiInputValue;
//
// Create event to record GCD descriptors at end of dxe for judging AHCI/NVMe PCI Bar
// is in MMIO space to avoid attack.
//
Status = gSmst->SmmRegisterProtocolNotify (&gEfiSmmEndOfDxeProtocolGuid, OpalPasswordEndOfDxeNotification, &EndOfDxeEvent);
if (EFI_ERROR (Status)) {
DEBUG((DEBUG_ERROR, "OpalPasswordSmm: Register SmmEndOfDxe fail, Status: %r\n", Status));
goto EXIT;
}
Status = gSmst->SmmLocateProtocol (&gEfiSmmVariableProtocolGuid, NULL, (VOID**)&SmmVariable);
if (!EFI_ERROR (Status)) {
DataSize = sizeof (OPAL_EXTRA_INFO_VAR);