sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NetworkPkg: Ignore BootFileName if it is overloaded.

Browse Source 
Make sure "File" field is not overloaded to carry other DHCP options before use
it in HTTP boot driver.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
This commit is contained in:
Fu Siyuan
2016-05-03 13:29:23 +08:00
parent 61e0f079bc
commit b7f28e1a6c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
NetworkPkg/HttpBootDxe/HttpBootDhcp4.c
View File

@ -259,11 +259,13 @@ HttpBootParseDhcp4Packet (
EFI_STATUS Status; EFI_STATUS Status;
HTTP_BOOT_OFFER_TYPE OfferType; HTTP_BOOT_OFFER_TYPE OfferType;
EFI_IPv4_ADDRESS IpAddr; EFI_IPv4_ADDRESS IpAddr;
BOOLEAN FileFieldOverloaded;
IsDnsOffer = FALSE; IsDnsOffer = FALSE;
IpExpressedUri = FALSE; IpExpressedUri = FALSE;
IsProxyOffer = FALSE; IsProxyOffer = FALSE;
IsHttpOffer = FALSE; IsHttpOffer = FALSE;
FileFieldOverloaded = FALSE;
ZeroMem (Cache4->OptList, sizeof (Cache4->OptList)); ZeroMem (Cache4->OptList, sizeof (Cache4->OptList));
@ -288,6 +290,7 @@ HttpBootParseDhcp4Packet (
Option = Options[HTTP_BOOT_DHCP4_TAG_INDEX_OVERLOAD]; Option = Options[HTTP_BOOT_DHCP4_TAG_INDEX_OVERLOAD];
if (Option != NULL) { if (Option != NULL) {
if ((Option->Data[0] & HTTP_BOOT_DHCP4_OVERLOAD_FILE) != 0) { if ((Option->Data[0] & HTTP_BOOT_DHCP4_OVERLOAD_FILE) != 0) {
FileFieldOverloaded = TRUE;
for (Index = 0; Index < HTTP_BOOT_DHCP4_TAG_INDEX_MAX; Index++) { for (Index = 0; Index < HTTP_BOOT_DHCP4_TAG_INDEX_MAX; Index++) {
if (Options[Index] == NULL) { if (Options[Index] == NULL) {
Options[Index] = HttpBootParseDhcp4Options ( Options[Index] = HttpBootParseDhcp4Options (
@ -351,7 +354,7 @@ HttpBootParseDhcp4Packet (
if (*(Ptr8 - 1) != '\0') { if (*(Ptr8 - 1) != '\0') {
*Ptr8 = '\0'; *Ptr8 = '\0';
} }
} else if (Offer->Dhcp4.Header.BootFileName[0] != 0) { } else if (!FileFieldOverloaded && Offer->Dhcp4.Header.BootFileName[0] != 0) {
// //
// If the bootfile is not present and bootfilename is present in DHCPv4 packet, just parse it. // If the bootfile is not present and bootfilename is present in DHCPv4 packet, just parse it.
// Do not count dhcp option header here, or else will destroy the serverhostname. // Do not count dhcp option header here, or else will destroy the serverhostname.