[edk2] [PATCH v2] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr dereference

[Hao Wu]

Cc: Jiewen Yao <jiewen....@intel.com>
Cc: Jeff Fan <jeff....@intel.com>
Cc: Michael Kinney <michael.d.kin...@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a...@intel.com>
---
 UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c 
b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
index f4716f3..d967255 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
@@ -1011,6 +1011,10 @@ GetUefiMemoryMap (
     }
   } while (Status == EFI_BUFFER_TOO_SMALL);
 
+  if (MemoryMap == NULL) {
+    return ;
+  }
+
   SortMemoryMap (MemoryMap, UefiMemoryMapSize, mUefiDescriptorSize);
   MergeMemoryMapForNotPresentEntry (MemoryMap, &UefiMemoryMapSize, 
mUefiDescriptorSize);
 
@@ -1080,6 +1084,13 @@ IsSmmCommBufferForbiddenAddress (
   UINTN                 MemoryMapEntryCount;
   UINTN                 Index;
 
+  DEBUG ((DEBUG_INFO, "IsSmmCommBufferForbiddenAddress\n"));
+
+  if (mUefiMemoryMap == NULL) {
+    DEBUG ((DEBUG_INFO, "UefiMemoryMap - NULL\n"));
+    return FALSE;
+  }
+
   MemoryMap = mUefiMemoryMap;
   MemoryMapEntryCount = mUefiMemoryMapSize/mUefiDescriptorSize;
   for (Index = 0; Index < MemoryMapEntryCount; Index++) {
-- 
1.9.5.msysgit.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel