diff options
| author | Fu Siyuan <siyuan.fu@intel.com> | 2015-03-26 04:49:30 +0000 |
|---|---|---|
| committer | sfu5 <sfu5@Edk2> | 2015-03-26 04:49:30 +0000 |
| commit | 903d1fa9918844cfc25b24f4892e779bb77fa4c0 (patch) | |
| tree | 4ab25275155764dd792233b1a00e0c378a42e9cb | |
| parent | 1044ef6be57151a2011257418807c77173d54405 (diff) | |
| download | edk2-platforms-903d1fa9918844cfc25b24f4892e779bb77fa4c0.tar.xz | |
PXE driver bug fix.
1. Update the parameter check of PXE.UdpRead() to align with spec definition.
2. Update PXE driver to use EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_IP when calling UdpRead to receive server discovery message.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17075 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c | 14 | ||||
| -rw-r--r-- | NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c | 8 |
2 files changed, 10 insertions, 12 deletions
diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c index 07f1724365..35bdc57479 100644 --- a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c @@ -2,7 +2,7 @@ Functions implementation related with DHCPv6 for UefiPxeBc Driver.
(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
- Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -793,8 +793,8 @@ PxeBcRequestBootService ( Status = PxeBc->UdpRead (
PxeBc,
- EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_IP,
- &Private->StationIp,
+ EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_IP | EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_IP,
+ NULL,
&SrcPort,
&Private->ServerIp,
&DestPort,
@@ -1807,7 +1807,6 @@ PxeBcDhcp6Discover ( UINT8 *RequestOpt;
UINT8 *DiscoverOpt;
UINTN ReadSize;
- UINT16 OpFlags;
UINT16 OpCode;
UINT16 OpLen;
UINT32 Xid;
@@ -1818,7 +1817,6 @@ PxeBcDhcp6Discover ( Request = Private->Dhcp6Request;
SrcPort = PXEBC_BS_DISCOVER_PORT;
DestPort = PXEBC_BS_DISCOVER_PORT;
- OpFlags = 0;
if (!UseBis && Layer != NULL) {
*Layer &= EFI_PXE_BASE_CODE_BOOT_LAYER_MASK;
@@ -1862,7 +1860,7 @@ PxeBcDhcp6Discover ( Status = PxeBc->UdpWrite (
PxeBc,
- OpFlags,
+ 0,
&Private->ServerIp,
&DestPort,
NULL,
@@ -1899,8 +1897,8 @@ PxeBcDhcp6Discover ( Status = PxeBc->UdpRead (
PxeBc,
- OpFlags,
- &Private->StationIp,
+ EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_IP,
+ NULL,
&SrcPort,
&Private->ServerIp,
&DestPort,
diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c index 19c83d3234..374b4a1667 100644 --- a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c @@ -1265,7 +1265,7 @@ EfiPxeBcUdpRead ( UINTN FragmentIndex;
UINT8 *FragmentBuffer;
- if (This == NULL || DestIp == NULL || DestPort == NULL) {
+ if (This == NULL) {
return EFI_INVALID_PARAMETER;
}
@@ -1276,9 +1276,9 @@ EfiPxeBcUdpRead ( Udp4Rx = NULL;
Udp6Rx = NULL;
- if (((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_PORT) != 0 && DestPort == NULL) ||
- ((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_IP) != 0 && SrcIp == NULL) ||
- ((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_PORT) != 0 && SrcPort == NULL)) {
+ if (((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_PORT) == 0 && DestPort == NULL) ||
+ ((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_IP) == 0 && SrcIp == NULL) ||
+ ((OpFlags & EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_PORT) == 0 && SrcPort == NULL)) {
return EFI_INVALID_PARAMETER;
}
|