X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FNetwork%2FUefiPxeBcDxe%2FPxeBcDhcp.c;h=5e86cf5779e6cc10e2789bc221dcaaad79820c5e;hp=c04b2032c7762224808452627f722b840b7feb48;hb=2ce5c88a7adaea3eeeccc932b18da5f02440f8cd;hpb=890986ca2a976fb7f79f0734b606a75cdcabb87e

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
index c04b2032c7..5e86cf5779 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
@@ -275,10 +275,11 @@ PxeBcTryBinl (
   Offer = &Private->Dhcp4Offers[Index].Packet.Offer;
 
   //
-  // use option 54, if zero, use siaddr in header
+  // Use siaddr(next server) in DHCPOFFER packet header, if zero, use option 54(server identifier)
+  // in DHCPOFFER packet.
+  // (It does not comply with PXE Spec, Ver2.1)
   //
-  ZeroMem (&ServerIp, sizeof(EFI_IP_ADDRESS));
-  if (Private->Dhcp4Offers[Index].Dhcp4Option[PXEBC_DHCP4_TAG_INDEX_SERVER_ID] != NULL) {
+  if (EFI_IP4_EQUAL (&Offer->Dhcp4.Header.ServerAddr.Addr, &mZeroIp4Addr)) {
     CopyMem (
       &ServerIp.Addr[0],
       Private->Dhcp4Offers[Index].Dhcp4Option[PXEBC_DHCP4_TAG_INDEX_SERVER_ID]->Data,
@@ -1113,8 +1114,6 @@ PxeBcDiscvBootService (
   EFI_DHCP4_HEADER                    *DhcpHeader;
   UINT32                              Xid;
 
-  ASSERT (IsDiscv && (Layer != NULL));
-
   Mode      = Private->PxeBc.Mode;
   Dhcp4     = Private->Dhcp4;
   Status    = EFI_SUCCESS;
@@ -1136,6 +1135,7 @@ PxeBcDiscvBootService (
   OptCount = PxeBcBuildDhcpOptions (Private, OptList, FALSE);
 
   if (IsDiscv) {
+    ASSERT (Layer != NULL);
     //
     // Add vendor option of PXE_BOOT_ITEM
     //
@@ -1715,10 +1715,10 @@ PxeBcSelectBootMenu (
   }
 
   while (MenuSize > 0) {
-    MenuArray[Index]  = MenuItem;
+    MenuArray[Index++]  = MenuItem;
     MenuSize          = (UINT8) (MenuSize - (MenuItem->DescLen + 3));
     MenuItem          = (PXEBC_BOOT_MENU_ENTRY *) ((UINT8 *) MenuItem + MenuItem->DescLen + 3);
-    if (Index++ > (PXEBC_MAX_MENU_NUM - 1)) {
+    if (Index >= PXEBC_MAX_MENU_NUM) {
       break;
     }
   }
@@ -1738,6 +1738,7 @@ PxeBcSelectBootMenu (
   TopRow  = gST->ConOut->Mode->CursorRow - MenuNum;
 
   do {
+    ASSERT (Select < PXEBC_MAX_MENU_NUM);
     //
     // highlight selected row
     //