UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr dereference

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
index f4716f3433a8dd6073d2d0c5ea1846fc4ee3338b..13323d5409d555c881b0990b38461bdedceb8c05 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
@@ -1011,6 +1011,10 @@ GetUefiMemoryMap (
     }\r
   } while (Status == EFI_BUFFER_TOO_SMALL);\r
 \r
+  if (MemoryMap == NULL) {\r
+    return ;\r
+  }\r
+\r
   SortMemoryMap (MemoryMap, UefiMemoryMapSize, mUefiDescriptorSize);\r
   MergeMemoryMapForNotPresentEntry (MemoryMap, &UefiMemoryMapSize, mUefiDescriptorSize);\r
 \r
@@ -1080,6 +1084,10 @@ IsSmmCommBufferForbiddenAddress (
   UINTN                 MemoryMapEntryCount;\r
   UINTN                 Index;\r
 \r
+  if (mUefiMemoryMap == NULL) {\r
+    return FALSE;\r
+  }\r
+\r
   MemoryMap = mUefiMemoryMap;\r
   MemoryMapEntryCount = mUefiMemoryMapSize/mUefiDescriptorSize;\r
   for (Index = 0; Index < MemoryMapEntryCount; Index++) {\r