MdeModulePkg/UefiBootManagerLib: fix crash on uninitialized ExitData

As reported by Gary, the recent LoadImage/StartImage changes to
accommodate dispatching PE/COFF images built for foreign architectures
may result in a crash when loading an IA32 option ROM into a X64 VM
running OVMF:

  Loading driver at 0x0007E537000 EntryPoint=0x0007E53C06D 8086100e.efi
  InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 7F003B98
  ProtectUefiImageCommon - 0x7F002BC0
    - 0x000000007E537000 - 0x000000000009F900
  Image type IA32 can't be started on X64 UEFI system.
  ASSERT MdeModulePkg/Core/Dxe/Mem/Pool.c(698): Head->Signature == ((('p') |
              ('h' << 8)) | ((('d') | ('0' << 8)) << 16)) || Head->Signature
              == ((('p') | ('h' << 8)) | ((('d') | ('1' << 8)) << 16))

This turns out to be caused by the deferred image loading code in BDS,
which ends up trying to free an uninitialized 'ExitData' pointer.

Given that ExitData is never actually used, let's just get rid of it
entirely. While we're at it, drop the pointless assignment of Status
as well.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Gary Lin <glin@suse.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c b/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c
index fc8775dfa419c774b4c57dca1eef715e32134be6..6b8fb4d92461c4419937d8f1b78a50abf32c5696 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c
@@ -439,8 +439,6 @@ EfiBootManagerDispatchDeferredImages (
   UINTN                              ImageSize;\r
   BOOLEAN                            BootOption;\r
   EFI_HANDLE                         ImageHandle;\r
-  UINTN                              ExitDataSize;\r
-  CHAR16                             *ExitData;\r
   UINTN                              ImageCount;\r
   UINTN                              LoadCount;\r
 \r
@@ -502,10 +500,7 @@ EfiBootManagerDispatchDeferredImages (
         // a 5 Minute period\r
         //\r
         gBS->SetWatchdogTimer (5 * 60, 0x0000, 0x00, NULL);\r
-        Status = gBS->StartImage (ImageHandle, &ExitDataSize, &ExitData);\r
-        if (ExitData != NULL) {\r
-          FreePool (ExitData);\r
-        }\r
+        gBS->StartImage (ImageHandle, NULL, NULL);\r
 \r
         //\r
         // Clear the Watchdog Timer after the image returns.\r