MdeModulePkg:Prevent the BmRepairAllControllers routine in an infinite loop

Prevent the BmRepairAllControllers routine in an infinite loop

Contributed-under: TianoCore Contribution Agreement 1.0

Signed-off-by: Gary Li <garyli@hpe.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

1 files changed, 9 insertions, 2 deletions

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c b/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
index bffbedaf84..1e68cbc01f 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
@@ -1,8 +1,9 @@
 /** @file

   Library functions which relates with driver health.

 

-(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>

 Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>

+(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>

+(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -439,6 +440,8 @@ BmRepairAllControllers (
   BOOLEAN                             RebootRequired;

   EFI_HII_HANDLE                      *HiiHandles;

   EFI_FORM_BROWSER2_PROTOCOL          *FormBrowser2;

+  UINT32                              MaxRepairCount;

+  UINT32                              RepairCount;

 

   //

   // Configure PcdDriverHealthConfigureForm to ZeroGuid to disable driver health check.

@@ -450,6 +453,9 @@ BmRepairAllControllers (
   Status = gBS->LocateProtocol (&gEfiFormBrowser2ProtocolGuid, NULL, (VOID **) &FormBrowser2);

   ASSERT_EFI_ERROR (Status);

 

+  MaxRepairCount = PcdGet32 (PcdMaxRepairCount);

+  RepairCount = 0;

+

   do {

     RepairRequired        = FALSE;

     ConfigurationRequired = FALSE;

@@ -512,7 +518,8 @@ BmRepairAllControllers (
     }

   

     EfiBootManagerFreeDriverHealthInfo (DriverHealthInfo, Count);

-  } while (RepairRequired || ConfigurationRequired);

+    RepairCount++;

+  } while ((RepairRequired || ConfigurationRequired) && ((MaxRepairCount == 0) || (RepairCount < MaxRepairCount)));

 

   RebootRequired    = FALSE;

   ReconnectRequired = FALSE;