1 files changed, 53 insertions, 1 deletions
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
index d6907955a5..91ebd8c27f 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
@@ -141,6 +141,7 @@ PxeBcDriverBindingStart (
   UINTN               Index;
   EFI_STATUS          Status;
 
+  CpuDeadLoop ();
   Private = AllocateZeroPool (sizeof (PXEBC_PRIVATE_DATA));
   if (Private == NULL) {
     return EFI_OUT_OF_RESOURCES;
@@ -179,6 +180,28 @@ PxeBcDriverBindingStart (
   Status = NetLibCreateServiceChild (
             ControllerHandle,
             This->DriverBindingHandle,
+            &gEfiArpServiceBindingProtocolGuid,
+            &Private->ArpChild
+            );
+  if (EFI_ERROR (Status)) {
+    goto ON_ERROR;
+  }
+
+  Status = gBS->OpenProtocol (
+                  Private->ArpChild,
+                  &gEfiArpProtocolGuid,
+                  (VOID **) &Private->Arp,
+                  This->DriverBindingHandle,
+                  ControllerHandle,
+                  EFI_OPEN_PROTOCOL_BY_DRIVER
+                  );
+  if (EFI_ERROR (Status)) {
+    goto ON_ERROR;
+  }
+
+  Status = NetLibCreateServiceChild (
+            ControllerHandle,
+            This->DriverBindingHandle,
             &gEfiDhcp4ServiceBindingProtocolGuid,
             &Private->Dhcp4Child
             );
@@ -247,7 +270,7 @@ PxeBcDriverBindingStart (
   }
 
   ZeroMem (&Private->Udp4CfgData, sizeof (EFI_UDP4_CONFIG_DATA));
-  Private->Udp4CfgData.AcceptBroadcast    = TRUE;
+  Private->Udp4CfgData.AcceptBroadcast    = FALSE;
   Private->Udp4CfgData.AcceptPromiscuous  = FALSE;
   Private->Udp4CfgData.AcceptAnyPort      = FALSE;
   Private->Udp4CfgData.AllowDuplicatePort = TRUE;
@@ -322,6 +345,22 @@ ON_ERROR:
       );
   }
 
+  if (Private->ArpChild != NULL) {
+    gBS->CloseProtocol (
+          Private->ArpChild,
+          &gEfiArpProtocolGuid,
+          This->DriverBindingHandle,
+          ControllerHandle
+          );
+
+    NetLibDestroyServiceChild (
+      ControllerHandle,
+      This->DriverBindingHandle,
+      &gEfiArpServiceBindingProtocolGuid,
+      Private->ArpChild
+      );
+  }
+
   gBS->FreePool (Private);
 
   return Status;
@@ -433,6 +472,19 @@ PxeBcDriverBindingStop (
       Private->Mtftp4Child
       );
 
+    gBS->CloseProtocol (
+          Private->ArpChild,
+          &gEfiArpProtocolGuid,
+          This->DriverBindingHandle,
+          NicHandle
+          );
+    NetLibDestroyServiceChild (
+      NicHandle,
+      This->DriverBindingHandle,
+      &gEfiArpServiceBindingProtocolGuid,
+      Private->ArpChild
+      );
+
     gBS->FreePool (Private);
   }