MdeModulePkg: Upon BootOption failure, Destroy RamDisk memory before RSC.

[mirror_edk2.git] / MdeModulePkg / Library / UefiBootManagerLib / BmBoot.c

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
index 540d169ec1a6a0170b81581e25c023549a8931b2..aff620ad52eec6e51bffad40ba982bd9885b0a85 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
@@ -2,7 +2,7 @@
   Library functions which relates with booting.\r
 \r
 Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.\r
-Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2020, Intel Corporation. All rights reserved.<BR>\r
 (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>\r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
@@ -1903,17 +1903,17 @@ EfiBootManagerBoot (
         gBS->UnloadImage (ImageHandle);\r
       }\r
       //\r
-      // Report Status Code with the failure status to indicate that the failure to load boot option\r
-      //\r
-      BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR, Status);\r
-      BootOption->Status = Status;\r
-      //\r
       // Destroy the RAM disk\r
       //\r
       if (RamDiskDevicePath != NULL) {\r
         BmDestroyRamDisk (RamDiskDevicePath);\r
         FreePool (RamDiskDevicePath);\r
       }\r
+      //\r
+      // Report Status Code with the failure status to indicate that the failure to load boot option\r
+      //\r
+      BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR, Status);\r
+      BootOption->Status = Status;\r
       return;\r
     }\r
   }\r
@@ -1982,13 +1982,6 @@ EfiBootManagerBoot (
   Status = gBS->StartImage (ImageHandle, &BootOption->ExitDataSize, &BootOption->ExitData);\r
   DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Image Return Status = %r\n", Status));\r
   BootOption->Status = Status;\r
-  if (EFI_ERROR (Status)) {\r
-    //\r
-    // Report Status Code with the failure status to indicate that boot failure\r
-    //\r
-    BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_FAILED, Status);\r
-  }\r
-  PERF_END_EX (gImageHandle, "BdsAttempt", NULL, 0, (UINT32) OptionNumber);\r
 \r
   //\r
   // Destroy the RAM disk\r
@@ -1998,6 +1991,15 @@ EfiBootManagerBoot (
     FreePool (RamDiskDevicePath);\r
   }\r
 \r
+  if (EFI_ERROR (Status)) {\r
+    //\r
+    // Report Status Code with the failure status to indicate that boot failure\r
+    //\r
+    BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_FAILED, Status);\r
+  }\r
+  PERF_END_EX (gImageHandle, "BdsAttempt", NULL, 0, (UINT32) OptionNumber);\r
+\r
+\r
   //\r
   // Clear the Watchdog Timer after the image returns\r
   //\r