From d46c53cfc6fe98fbb51afc2560dac26703e3d178 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 13 Sep 2017 10:07:55 +0300 Subject: [PATCH] [efi] Continue to connect remaining handles after connection errors Some UEFI BIOSes will deliberately break the implementation of ConnectController() to return errors for devices that have been "disabled" via the BIOS setup screen. (As an added bonus, such BIOSes may return garbage EFI_STATUS values such as 0xff.) Work around these broken UEFI BIOSes by ignoring failures and continuing to attempt to connect any remaining handles. Signed-off-by: Michael Brown --- src/interface/efi/efi_driver.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/interface/efi/efi_driver.c b/src/interface/efi/efi_driver.c index 22aa3ee7..2cefed2f 100644 --- a/src/interface/efi/efi_driver.c +++ b/src/interface/efi/efi_driver.c @@ -497,14 +497,16 @@ static int efi_driver_handles ( int ( * method ) ( EFI_HANDLE handle ) ) { /* Connect/disconnect driver from all handles */ for ( i = 0 ; i < num_handles ; i++ ) { - if ( ( rc = method ( handles[i] ) ) != 0 ) - goto err_method; + if ( ( rc = method ( handles[i] ) ) != 0 ) { + /* Ignore errors and continue to process + * remaining handles. + */ + } } /* Success */ rc = 0; - err_method: bs->FreePool ( handles ); err_locate: return rc;