efi_loader: correct OpenProtocol()

If a protocol is opened BY_DRIVER it cannot be opened by another agent
BY_DRIVER.

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 e31b3b1622
commit 399a39e34a

View File

@ -2637,15 +2637,23 @@ static efi_status_t efi_protocol_open(
if ((attributes & EFI_OPEN_PROTOCOL_BY_DRIVER) &&
(item->info.attributes == attributes))
return EFI_ALREADY_STARTED;
} else {
if (item->info.attributes &
EFI_OPEN_PROTOCOL_BY_DRIVER)
opened_by_driver = true;
}
if (item->info.attributes & EFI_OPEN_PROTOCOL_EXCLUSIVE)
opened_exclusive = true;
}
/* Only one controller can open the protocol exclusively */
if (opened_exclusive && attributes &
(EFI_OPEN_PROTOCOL_EXCLUSIVE | EFI_OPEN_PROTOCOL_BY_DRIVER))
return EFI_ACCESS_DENIED;
if (attributes & EFI_OPEN_PROTOCOL_EXCLUSIVE) {
if (opened_exclusive)
return EFI_ACCESS_DENIED;
} else if (attributes & EFI_OPEN_PROTOCOL_BY_DRIVER) {
if (opened_exclusive || opened_by_driver)
return EFI_ACCESS_DENIED;
}
/* Prepare exclusive opening */
if (attributes & EFI_OPEN_PROTOCOL_EXCLUSIVE) {