proxmox-mirrors/efi-boot-shim
1
0
Fork 0
mirror of https://git.proxmox.com/git/efi-boot-shim synced 2025-08-13 08:51:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

httpboot: Amend the device path matching rule

Browse Source 
Originally, we check if the last 2 nodes in the device path are
IPv4()/Uri() or IPv6()/Uri() to determine whether httpboot is used or
not. However, since UEFI 2.7, the DNS node will be inserted between the
IP node and the URI node if the server provides the DNS server address.
This commit changes the matching rule to search IP node and URI node
and ignore any node between those two nodes.

Signed-off-by: Gary Lin <glin@suse.com>
This commit is contained in:
Gary Lin 2017-10-27 11:36:40 +08:00 committed by Peter Jones
parent c8ca1c5696
commit a752290c38
1 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
httpboot.c
View File

@ -103,10 +103,11 @@ find_httpboot (EFI_HANDLE device)
{ {
EFI_DEVICE_PATH *unpacked; EFI_DEVICE_PATH *unpacked;
EFI_DEVICE_PATH *Node; EFI_DEVICE_PATH *Node;
EFI_DEVICE_PATH *NextNode;
MAC_ADDR_DEVICE_PATH *MacNode; MAC_ADDR_DEVICE_PATH *MacNode;
URI_DEVICE_PATH *UriNode; URI_DEVICE_PATH *UriNode;
UINTN uri_size; UINTN uri_size;
BOOLEAN ip_found = FALSE;
BOOLEAN ret = FALSE;
if (uri) { if (uri) {
FreePool(uri); FreePool(uri);
@ -126,50 +127,60 @@ find_httpboot (EFI_HANDLE device)
} }
Node = unpacked; Node = unpacked;
/* Traverse the device path to find IPv4()/Uri() or IPv6()/Uri() */ /* Traverse the device path to find IPv4()/.../Uri() or
* IPv6()/.../Uri() */
while (!IsDevicePathEnd(Node)) { while (!IsDevicePathEnd(Node)) {
/* Save the MAC node so we can match the net card later */ /* Save the MAC node so we can match the net card later */
if (DevicePathType(Node) == MESSAGING_DEVICE_PATH && if (DevicePathType(Node) == MESSAGING_DEVICE_PATH &&
DevicePathSubType(Node) == MSG_MAC_ADDR_DP) { DevicePathSubType(Node) == MSG_MAC_ADDR_DP) {
MacNode = (MAC_ADDR_DEVICE_PATH *)Node; MacNode = (MAC_ADDR_DEVICE_PATH *)Node;
CopyMem(&mac_addr, &MacNode->MacAddress, sizeof(EFI_MAC_ADDRESS)); CopyMem(&mac_addr, &MacNode->MacAddress,
} sizeof(EFI_MAC_ADDRESS));
} else if (DevicePathType(Node) == MESSAGING_DEVICE_PATH &&
if (DevicePathType(Node) == MESSAGING_DEVICE_PATH && (DevicePathSubType(Node) == MSG_IPv4_DP ||
(DevicePathSubType(Node) == MSG_IPv4_DP || DevicePathSubType(Node) == MSG_IPv6_DP)) {
DevicePathSubType(Node) == MSG_IPv6_DP)) { /* Save the IP node so we can set up the connection */
/* Save the IP node so we can set up the connection later */ /* later */
if (DevicePathSubType(Node) == MSG_IPv6_DP) { if (DevicePathSubType(Node) == MSG_IPv6_DP) {
CopyMem(&ip6_node, Node, sizeof(IPv6_DEVICE_PATH)); CopyMem(&ip6_node, Node,
sizeof(IPv6_DEVICE_PATH));
is_ip6 = TRUE; is_ip6 = TRUE;
} else { } else {
CopyMem(&ip4_node, Node, sizeof(IPv4_DEVICE_PATH)); CopyMem(&ip4_node, Node,
sizeof(IPv4_DEVICE_PATH));
is_ip6 = FALSE; is_ip6 = FALSE;
} }
Node = NextDevicePathNode(Node); ip_found = TRUE;
} else if (ip_found == TRUE &&
(DevicePathType(Node) == MESSAGING_DEVICE_PATH &&
DevicePathSubType(Node) == MSG_URI_DP)) {
EFI_DEVICE_PATH *NextNode;
/* Check if the URI node is the last node since the */
/* RAMDISK node could be appended, and we don't need */
/* to download the second stage loader in that case. */
NextNode = NextDevicePathNode(Node); NextNode = NextDevicePathNode(Node);
if (DevicePathType(Node) == MESSAGING_DEVICE_PATH && if (!IsDevicePathEnd(NextNode))
DevicePathSubType(Node) == MSG_URI_DP && continue;
IsDevicePathEnd(NextNode)) {
/* Save the current URI */ /* Save the current URI */
UriNode = (URI_DEVICE_PATH *)Node; UriNode = (URI_DEVICE_PATH *)Node;
uri_size = strlena(UriNode->Uri); uri_size = strlena(UriNode->Uri);
uri = AllocatePool(uri_size + 1); uri = AllocatePool(uri_size + 1);
if (!uri) { if (!uri) {
perror(L"Failed to allocate uri\n"); perror(L"Failed to allocate uri\n");
return FALSE; goto out;
}
CopyMem(uri, UriNode->Uri, uri_size + 1);
FreePool(unpacked);
return TRUE;
} }
CopyMem(uri, UriNode->Uri, uri_size + 1);
ret = TRUE;
goto out;
} }
Node = NextDevicePathNode(Node); Node = NextDevicePathNode(Node);
} }
out:
FreePool(unpacked); FreePool(unpacked);
return FALSE; return ret;
} }
static EFI_STATUS static EFI_STATUS