MdeModulePkg/PlatformDriOverride: Unload image on EFI_SECURITY_VIOLATION

[mirror_edk2.git] / MdeModulePkg / Universal / PlatformDriOverrideDxe / PlatDriOverrideLib.c

diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c
index 2d3736b468828ff7dbb99c190b99a671d7a18d24..f91f038b7ad605b76a7814ee96c9399bf791f708 100644 (file)
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c
+++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of the shared functions to do the platform driver vverride mapping.\r
 \r
-  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -1486,6 +1486,15 @@ GetDriverFromMapping (
                 DriverImageInfo->ImageHandle = ImageHandle;\r
               }\r
             } else {\r
+              //\r
+              // With EFI_SECURITY_VIOLATION retval, the Image was loaded and an ImageHandle was created\r
+              // with a valid EFI_LOADED_IMAGE_PROTOCOL, but the image can not be started right now.\r
+              // If the caller doesn't have the option to defer the execution of an image, we should\r
+              // unload image for the EFI_SECURITY_VIOLATION to avoid resource leak.\r
+              //\r
+              if (Status == EFI_SECURITY_VIOLATION) {\r
+                gBS->UnloadImage (ImageHandle);\r
+              }\r
               DriverImageInfo->UnLoadable = TRUE;\r
               DriverImageInfo->ImageHandle = NULL;\r
             }\r