Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-25 06:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

efi_loader: avoid crash in OpenProtocol()

Browse source 
When trying to open a protocol exclusively attached drivers have to be
removed. This removes entries in the open protocol information linked list
over which we are looping. As additionally child controllers may have been
removed the only safe thing to do is to restart the loop over the linked
list when a driver is removed.

By observing the return code of DisconnectController() we can eliminate a
loop.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt 2019-05-30 14:16:31 +02:00
parent 399a39e34a
commit dae7ce451c
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/efi_loader/efi_boottime.c
View file

@ -2658,21 +2658,29 @@ static efi_status_t efi_protocol_open(
/* Prepare exclusive opening */
if (attributes & EFI_OPEN_PROTOCOL_EXCLUSIVE) {
/* Try to disconnect controllers */
disconnect_next:
opened_by_driver = false;
list_for_each_entry(item, &handler->open_infos, link) {
efi_status_t ret;
if (item->info.attributes ==
EFI_OPEN_PROTOCOL_BY_DRIVER)
EFI_CALL(efi_disconnect_controller(
EFI_OPEN_PROTOCOL_BY_DRIVER) {
ret = EFI_CALL(efi_disconnect_controller(
item->info.controller_handle,
item->info.agent_handle,
NULL));
if (ret == EFI_SUCCESS)
/*
* Child controllers may have been
* removed from the open_infos list. So
* let's restart the loop.
*/
goto disconnect_next;
else
opened_by_driver = true;
}
}
opened_by_driver = false;
/* Check if all controllers are disconnected */
list_for_each_entry(item, &handler->open_infos, link) {
if (item->info.attributes & EFI_OPEN_PROTOCOL_BY_DRIVER)
opened_by_driver = true;
}
/* Only one controller can be connected */
/* Only one driver can be connected */
if (opened_by_driver)
return EFI_ACCESS_DENIED;
}