diff options
author | Guomin Jiang <guomin.jiang@intel.com> | 2021-01-13 18:08:09 +0800 |
---|---|---|
committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2021-02-04 01:30:05 +0000 |
commit | f6ec1dd34fb6b9757b5ead465ee2ea20c182b0ac (patch) | |
tree | 6bb89151c2c979a6071526efb651d8ae0d453b11 /UefiCpuPkg/CpuMpPei/CpuPaging.c | |
parent | e806bb29cfde1b242bb37e72e77364dd812830e0 (diff) | |
download | edk2-f6ec1dd34fb6b9757b5ead465ee2ea20c182b0ac.tar.gz edk2-f6ec1dd34fb6b9757b5ead465ee2ea20c182b0ac.tar.bz2 edk2-f6ec1dd34fb6b9757b5ead465ee2ea20c182b0ac.zip |
UefiCpuPkg: Move MigrateGdt from DiscoverMemory to TempRamDone. (CVE-2019-11098)
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1614
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3160
The GDT still in flash with commit 60b12e69fb1c8c7180fdda92f008248b9ec83db1
after TempRamDone
So move the action to TempRamDone event to avoid reading GDT from flash.
Signed-off-by: Guomin Jiang <guomin.jiang@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Cc: Debkumar De <debkumar.de@intel.com>
Cc: Harry Han <harry.han@intel.com>
Cc: Catharine West <catharine.west@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Diffstat (limited to 'UefiCpuPkg/CpuMpPei/CpuPaging.c')
-rw-r--r-- | UefiCpuPkg/CpuMpPei/CpuPaging.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/UefiCpuPkg/CpuMpPei/CpuPaging.c b/UefiCpuPkg/CpuMpPei/CpuPaging.c index 50ad4277af..3e261d6657 100644 --- a/UefiCpuPkg/CpuMpPei/CpuPaging.c +++ b/UefiCpuPkg/CpuMpPei/CpuPaging.c @@ -605,17 +605,9 @@ MemoryDiscoveredPpiNotifyCallback ( {
EFI_STATUS Status;
BOOLEAN InitStackGuard;
- BOOLEAN InterruptState;
EDKII_MIGRATED_FV_INFO *MigratedFvInfo;
EFI_PEI_HOB_POINTERS Hob;
- if (PcdGetBool (PcdMigrateTemporaryRamFirmwareVolumes)) {
- InterruptState = SaveAndDisableInterrupts ();
- Status = MigrateGdt ();
- ASSERT_EFI_ERROR (Status);
- SetInterruptState (InterruptState);
- }
-
//
// Paging must be setup first. Otherwise the exception TSS setup during MP
// initialization later will not contain paging information and then fail
|