diff options
| author | Mattiwatti <mattiwatti@gmail.com> | 2019-07-09 22:02:57 +0200 |
|---|---|---|
| committer | Mattiwatti <mattiwatti@gmail.com> | 2019-07-09 22:02:57 +0200 |
| commit | f9270cfb3897ec68f36c5d032127aa59587356bd (patch) | |
| tree | 09db19fc30adcea8d9d8b17e00e18638c1f21cce | |
| parent | 7702234474e8590db6b35ae540de9503e4e936c7 (diff) | |
Fix potential recursive self-boot by Loader.efi
The EFI variable "BootCurrent" corresponds to XXXX in some variable "BootXXXX", and this value was being used to guard against recursive self-booting. However, EfiBootManagerGetLoadOptions() already returns the options sorted by the contents of the "BootOrder" variable, which means that XXXX does not necessarily correspond to the linear index in a for loop. Instead use BootOptions[Index].OptionNumber to retrieve and compare the original value of XXXX
Fixes #5
| -rw-r--r-- | Application/Loader/Loader.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Application/Loader/Loader.c b/Application/Loader/Loader.c index d8addb9..a354261 100644 --- a/Application/Loader/Loader.c +++ b/Application/Loader/Loader.c @@ -252,7 +252,7 @@ BdsLibConnectAllDriversToAllControllers( // // Check to see if it's possible to dispatch an more DXE drivers. - // The BdsLibConnectAllEfi () may have made new DXE drivers show up. + // The BdsLibConnectAllEfi() may have made new DXE drivers show up. // If anything is Dispatched Status == EFI_SUCCESS and we will try // the connect again. // @@ -397,7 +397,7 @@ TryBootOptionsInOrder( // // This is us // - if (Index == CurrentBootOptionIndex) + if (BootOptions[Index].OptionNumber == CurrentBootOptionIndex) continue; // @@ -538,7 +538,7 @@ TryBootOptionsInOrder( gBS->SetWatchdogTimer(0x0000, 0x0000, 0x0000, NULL); // Clear the BootCurrent variable - gRT->SetVariable(L"BootCurrent", + gRT->SetVariable(EFI_BOOT_CURRENT_VARIABLE_NAME, &gEfiGlobalVariableGuid, 0, 0, |