archive-gh-me/OpenCorePkg
1
0
Fork 0
mirror of https://github.com/acidanthera/OpenCorePkg.git synced 2025-12-08 19:25:01 +00:00
Code Issues Projects Releases Wiki Activity

OcBootManagementLib: Display (external) suffix for external drives

Browse Source
This commit is contained in:
vit9696 2019-06-08 23:17:58 +03:00
parent 764b168f74
commit 60ce030486
4 changed files with 91 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Include/Library/OcBootManagementLib.h
View File

@ -41,6 +41,10 @@ typedef struct OC_BOOT_ENTRY_ {
//
BOOLEAN IsCustom;
//
// Set when this entry is an externally available entry (e.g. USB).
//
BOOLEAN IsExternal;
//
// Should try booting from first dmg found in DevicePath.
//
BOOLEAN IsFolder;

3
Library/OcBootManagementLib/BootManagementInternal.h
View File

@ -34,7 +34,8 @@ EFI_STATUS
InternalCheckScanPolicy (
IN EFI_HANDLE Handle,
IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFs,
IN UINT32 Policy
IN UINT32 Policy,
OUT BOOLEAN *External OPTIONAL
);
EFI_DEVICE_PATH_PROTOCOL *

5
Library/OcBootManagementLib/OcBootManagementLib.c
View File

@ -306,7 +306,7 @@ OcFillBootEntry (
Count = 0;
Status = InternalCheckScanPolicy (Handle, SimpleFs, Policy);
Status = InternalCheckScanPolicy (Handle, SimpleFs, Policy, &BootEntry->IsExternal);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_INFO, "OCB: Skipping handle %p due to scan policy %x\n", Handle, Policy));
return 0;
@ -553,6 +553,9 @@ OcShowSimpleBootMenu (
gST->ConOut->OutputString (gST->ConOut, Code);
gST->ConOut->OutputString (gST->ConOut, L". ");
gST->ConOut->OutputString (gST->ConOut, BootEntries[Index].Name);
if (BootEntries[Index].IsExternal) {
gST->ConOut->OutputString (gST->ConOut, L" (external)");
}
if (BootEntries[Index].IsFolder) {
gST->ConOut->OutputString (gST->ConOut, L" (dmg)");
}

141
Library/OcBootManagementLib/PolicyManagement.c
View File

@ -32,79 +32,100 @@
#include <Library/UefiLib.h>
#include <Library/UefiRuntimeServicesTableLib.h>
EFI_STATUS
InternalCheckScanPolicy (
IN EFI_HANDLE Handle,
IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFs,
IN UINT32 Policy
STATIC
UINT32
InternalGetRequestedPolicyType (
IN EFI_HANDLE Handle,
OUT BOOLEAN *External OPTIONAL
)
{
EFI_STATUS Status;
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
EFI_FILE_PROTOCOL *Root;
UINTN BufferSize;
UINT8 SubType;
Status = EFI_SUCCESS;
if (External != NULL) {
*External = FALSE;
}
Status = gBS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID **) &DevicePath);
if (EFI_ERROR (Status)) {
return 0;
}
if ((Policy & OC_SCAN_DEVICE_LOCK) != 0) {
Status = gBS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID **) &DevicePath);
if (EFI_ERROR (Status)) {
return Status;
}
Status = EFI_SECURITY_VIOLATION;
while (!IsDevicePathEnd (DevicePath)) {
if (DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) {
if ((Policy & OC_SCAN_ALLOW_DEVICE_SATA) != 0
&& DevicePathSubType (DevicePath) == MSG_SATA_DP) {
Status = EFI_SUCCESS;
} else if ((Policy & OC_SCAN_ALLOW_DEVICE_SASEX) != 0
&& DevicePathSubType (DevicePath) == MSG_SASEX_DP) {
Status = EFI_SUCCESS;
} else if ((Policy & OC_SCAN_ALLOW_DEVICE_SCSI) != 0
&& DevicePathSubType (DevicePath) == MSG_SCSI_DP) {
Status = EFI_SUCCESS;
} else if ((Policy & OC_SCAN_ALLOW_DEVICE_NVME) != 0
&& DevicePathSubType (DevicePath) == MSG_NVME_NAMESPACE_DP) {
Status = EFI_SUCCESS;
} else if ((Policy & OC_SCAN_ALLOW_DEVICE_ATAPI) != 0
&& DevicePathSubType (DevicePath) == MSG_ATAPI_DP) {
Status = EFI_SUCCESS;
} else if ((Policy & OC_SCAN_ALLOW_DEVICE_USB) != 0
&& DevicePathSubType (DevicePath) == MSG_USB_DP) {
Status = EFI_SUCCESS;
} else if ((Policy & OC_SCAN_ALLOW_DEVICE_FIREWIRE) != 0
&& DevicePathSubType (DevicePath) == MSG_1394_DP) {
Status = EFI_SUCCESS;
} else if ((Policy & OC_SCAN_ALLOW_DEVICE_SDCARD) != 0
&& (DevicePathSubType (DevicePath) == MSG_EMMC_DP
|| DevicePathSubType (DevicePath) == MSG_SD_DP)) {
Status = EFI_SUCCESS;
}
//
// We do not have good protection against device tunneling.
// These things must be considered:
// - Thunderbolt 2 PCI-e pass-through
// - Thunderbolt 3 PCI-e pass-through (Type-C, may be different from 2)
// - FireWire devices
// For now we hope that first messaging type protects us, and all
// subsequent messaging types are tunneled.
//
break;
while (!IsDevicePathEnd (DevicePath)) {
if (DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) {
SubType = DevicePathSubType (DevicePath);
switch (SubType) {
case MSG_SATA_DP:
return OC_SCAN_ALLOW_DEVICE_SATA;
case MSG_SASEX_DP:
return OC_SCAN_ALLOW_DEVICE_SASEX;
case MSG_SCSI_DP:
return OC_SCAN_ALLOW_DEVICE_SCSI;
case MSG_NVME_NAMESPACE_DP:
return OC_SCAN_ALLOW_DEVICE_NVME;
case MSG_ATAPI_DP:
if (External != NULL) {
*External = TRUE;
}
return OC_SCAN_ALLOW_DEVICE_ATAPI;
case MSG_USB_DP:
if (External != NULL) {
*External = TRUE;
}
return OC_SCAN_ALLOW_DEVICE_USB;
case MSG_1394_DP:
if (External != NULL) {
*External = TRUE;
}
return OC_SCAN_ALLOW_DEVICE_FIREWIRE;
case MSG_SD_DP:
case MSG_EMMC_DP:
if (External != NULL) {
*External = TRUE;
}
return OC_SCAN_ALLOW_DEVICE_SDCARD;
}
DevicePath = NextDevicePathNode (DevicePath);
//
// We do not have good protection against device tunneling.
// These things must be considered:
// - Thunderbolt 2 PCI-e pass-through
// - Thunderbolt 3 PCI-e pass-through (Type-C, may be different from 2)
// - FireWire devices
// For now we hope that first messaging type protects us, and all
// subsequent messaging types are tunneled.
//
break;
}
if (EFI_ERROR (Status)) {
return Status;
}
DevicePath = NextDevicePathNode (DevicePath);
}
return 0;
}
EFI_STATUS
InternalCheckScanPolicy (
IN EFI_HANDLE Handle,
IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFs,
IN UINT32 Policy,
OUT BOOLEAN *External OPTIONAL
)
{
EFI_STATUS Status;
EFI_FILE_PROTOCOL *Root;
UINTN BufferSize;
UINT32 RequestedPolicy;
RequestedPolicy = InternalGetRequestedPolicyType (Handle, External);
if ((Policy & OC_SCAN_DEVICE_LOCK) != 0 && (Policy & RequestedPolicy) == 0) {
return EFI_SECURITY_VIOLATION;
}
Status = EFI_SUCCESS;
if ((Policy & OC_SCAN_FILE_SYSTEM_LOCK) != 0) {
Status = SimpleFs->OpenVolume (SimpleFs, &Root);