UefiCpuPkg/PiSmmCpuDxeSmm: Avoid possible NULL ptr dereference

[mirror_edk2.git] / OvmfPkg / QemuFlashFvbServicesRuntimeDxe / QemuFlash.c

diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c
index 5b030468963523a168433168d6daadf92d14b4dc..462d9c0322f4d5d242e2f5f5d342e3d64812a2c1 100644 (file)
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c
@@ -13,8 +13,8 @@
 \r
 **/\r
 \r
-#include <Library/DebugLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
+#include <Library/DebugLib.h>\r
 #include <Library/PcdLib.h>\r
 \r
 #include "QemuFlash.h"\r
@@ -244,7 +244,17 @@ QemuFlashInitialize (
   ASSERT(PcdGet32 (PcdOvmfFirmwareFdSize) % mFdBlockSize == 0);\r
   mFdBlockCount = PcdGet32 (PcdOvmfFirmwareFdSize) / mFdBlockSize;\r
 \r
+  //\r
+  // execute module specific hooks before probing the flash\r
+  //\r
+  QemuFlashBeforeProbe (\r
+    (EFI_PHYSICAL_ADDRESS)(UINTN) mFlashBase,\r
+    mFdBlockSize,\r
+    mFdBlockCount\r
+    );\r
+\r
   if (!QemuFlashDetected ()) {\r
+    ASSERT (!FeaturePcdGet (PcdSmmSmramRequire));\r
     return EFI_WRITE_PROTECTED;\r
   }\r
 \r